# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1305672255 -7200
# Node ID d93ca857e4bb1a678c754d4fb922e98acc69e46c
# Parent  65b0318770d19d9fbc15b60363255c54984995e7# Parent  dd81191ffac3e59203dc9dc0d46c0ca34b2b751f
Merge with stable