# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1271723840 -7200
# Node ID a61028bb0c8e1823400b82eef8ef7f7a1e6a082c
# Parent  e61c92cf8a085bda53e50c7d396ea597f308c77e# Parent  bd17227407989d0993294735e7f085686d12d1c2
Merge with stable