# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1310039652 -3600
# Node ID 004f1f2dc06efb6beef1b652533f2ef50b8691e2
# Parent  87b7569d740486da7d4fd3636d49e9ace5082799# Parent  82015736cc7eeead37ad50c96561ff7369719f6c
Merge with default