# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1244099782 -7200
# Node ID 05cf88057fc5c769249a790e28ef2bbfc2d54ade
# Parent  3b4b797ba69db04564b40120f57ae52483b21436# Parent  a2bf4f77dbec704b1b499d87403b0b9b1f5e91a6
Merge with stable