# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1305754245 -7200
# Node ID eb6ebe425bf668e7657f4a5f6c06b620ef3cf849
# Parent  d93ca857e4bb1a678c754d4fb922e98acc69e46c# Parent  0af8a73dfe14be3666cfb5e8c23646b6ba3d5bd6
Merge with stable