# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1224750324 -7200
# Node ID 057aaae0f53e825dc047312a273e0c31d3c34bde
# Parent  fcaea85fcf8defbf57fc7e9b266126615c7ebfce# Parent  bc63f54d577a9c5c0eedca659f1f4240e903b130
Merge with stable