# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1305759066 -7200
# Node ID 12a2b9b99beba9e45efaba5f091fa2195f9053c4
# Parent  eb6ebe425bf668e7657f4a5f6c06b620ef3cf849# Parent  cf67cd5f683467d605ec3a851fa02edc2696f599
Merge with stable