# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1243355046 -7200
# Node ID ad5b41dddcda06fb359872172024a247261d0e16
# Parent  b7b183546a1572b6b6c0304300aaa6e1c66302ec# Parent  8533c85fe57dac6593d133ba0e668e2f7287de4b
Merge with stable