# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1243449611 -7200
# Node ID 6d14507dd15fb5f16b62b9983b34e3a18b09bc3e
# Parent  8533c85fe57dac6593d133ba0e668e2f7287de4b# Parent  baee5f7bfd32260caeb6a1f1da40d208b80ea971
(stable) merge with default