# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1333467290 -3600
# Node ID 2d2d93380694ccd98d4e1975769ce0387bb696cf
# Parent  3639efa7216a08a6506eb1d790b6f4e9c7450028# Parent  1745fd2dd308cdb8305731541e00f25b6b614e74
Merge with stable