# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1289298714 0
# Node ID bbb042e55f49f75086707e87fcc7a4fa8f61fcc5
# Parent  d36150edc23154b19016a59aac2c325538860759# Parent  1ea19e827b5bda840137a223ba56bfae83a9f29b
Merge with stable