# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1253354678 -7200
# Node ID c986858682e93ee094e68b3ab5053bda0e4fa575
# Parent  0c7f033354c7030012bcffd780a1135cb750a15d# Parent  c2b1a05b35e1c4f37e93737c2e77004e4d9456c8
Merge with stable