# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1333384135 -3600
# Node ID 3639efa7216a08a6506eb1d790b6f4e9c7450028
# Parent  671c1a0be907d2738185c892a7d772af578b89a5# Parent  66d2754c6f30c6f5d80c3aac2b8c9f4f7a2f4189
Merge with stable