# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1240908164 -3600
# Node ID 69c9e89471ae23e0d41b09e14d6a8e3cbb684728
# Parent  c04db4a88523f1765d08e5f3f865ce2841acbb54# Parent  e30c2a25101056a53601e9f54e3a421e004619aa
Merge with stable