# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1266440272 -3600
# Node ID 17528ccdaa1574aa47eef652c28abf5609243c6b
# Parent  26ca426a04e187a458c15e373f2353be68ebb7da# Parent  6d26c4bafda3abbf4fa7f782fb093ec2ae716156
(stable) merge