# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1271147328 -7200
# Node ID 1c69e8924c9cb0fcfc7cfac2909bef796e79de08
# Parent  0614ba0295f6ddf5bba1a17b75c88e38694a9785# Parent  85da4926cf39284b900093ac20d1a18f665f20d5
Merge with stable