# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1291279316 -3600
# Node ID e560e379ce304bf761df8755c170e8342b6e91bf
# Parent  2cadbd48a31b12407dec5bba1a8e43cbcbd6a1b3# Parent  d51c3fd4e34a076083511760f16d9bb220dc2352
Merge with stable