# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1225750599 -3600
# Node ID 5cf987b0f3a1da6e430113ac6e18ef2e10daad31
# Parent  057aaae0f53e825dc047312a273e0c31d3c34bde# Parent  6fccffd4059af4240926b7bb37c4bd7c3f3c1b47
Merge with stable