# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1271362574 -7200
# Node ID e61c92cf8a085bda53e50c7d396ea597f308c77e
# Parent  1b9ed0c8a189e44e98762297b3b018c62f2d7877# Parent  5df6643c39e9e9327f05eec9a9a2678315d95139
Merge with stable