# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1273850138 -7200
# Node ID 491c3fc0f551fd71ecb851639defd4d47bd91423
# Parent  9f46c562c4b5dd35a612162b027174d8c3384ac5# Parent  bceb04857ce198f7466be6db9ae8ab2c4d6a465d
Merge with stable