# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1300140674 -3600
# Node ID 2061f728babf4a548f22f4a64f9253f371ae644c
# Parent  ddd525b7dd4acb77172200188d6fe359d929f8bf# Parent  24924dfb8326959a8251efe87d13666ca4dd5f38
Merge with default