# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1272011828 -7200
# Node ID 67708fe93c9911d1e2754887f7e71b51f77a6f25
# Parent  a61028bb0c8e1823400b82eef8ef7f7a1e6a082c# Parent  0ff5881bc04b830180f1c1dffab241e5e412f4ad
Merge with stable