# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1271251402 -7200
# Node ID 1b9ed0c8a189e44e98762297b3b018c62f2d7877
# Parent  1c69e8924c9cb0fcfc7cfac2909bef796e79de08# Parent  f7050b041b5fc75101f44af9239f9d4d2561963e
Merge with stable