# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1219347126 -7200
# Node ID be7167cafb5ff8f5a1c89bd09266d98b872637a3
# Parent  d06af25db8ca77ae8c1063e1a987c807c4af56de# Parent  18dc6c3588eaebe3c508e20d99aeb963dce719f2
(stable) merge with default