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