# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1243813910 -7200
# Node ID 3b4b797ba69db04564b40120f57ae52483b21436
# Parent  baee5f7bfd32260caeb6a1f1da40d208b80ea971# Parent  2fc480f3e148704cd745f8e25c6fab8fe356e3c3
Merge with stable