# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1328969899 0
# Node ID a0451f80f66550d553e6c67b36f7d25e7e17f755
# Parent  cac01b4e4a6cdc597d2e0ec58f035b11badf4191# Parent  fcc01604f7a6c7cddfcc2d8e14c9089e3d229897
Merge with stable