# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1240853745 -3600
# Node ID c04db4a88523f1765d08e5f3f865ce2841acbb54
# Parent  37a22db17285d42c57a0b1f69f25f5b6cc4f4e34# Parent  db71342ad29db1a355a296d1a38b1e494fff8b15
Merge with stable