# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1239225231 -7200
# Node ID 09d1575f16c7f08259a6fa8eddcca4bc7d896e10
# Parent  bde29dbc3fc2229716f7f901026ac4a0b728485a# Parent  7197324dfa4d7ec54433cf334e2d7ab577e2cb47
Merge with stable