# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1254422559 -7200
# Node ID 3bfb3411f6f21aa4bb79fa08d049cbc57623515e
# Parent  c986858682e93ee094e68b3ab5053bda0e4fa575# Parent  c01143cef2c78b3a25724d3cbba8fe08d8e6d716
Merge with stable