# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1337300482 -3600
# Node ID a347814c7ff606f30cb73d4d6db5027790c99ce7
# Parent  bc8e57c1ae32d914a118775974dd7445bd960eab# Parent  9c31017cb4b2ef3866d15f1516af01bac50987c5
Merge with default