# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1322116968 0
# Node ID b2dd573fd8ca06fbca873eaa877c6d632f4b55d1
# Parent  f8c2547c8f169eb06c45e38dbaae94b0f929d3f5# Parent  ab16e060541e87e63372eedc67b89b2d1a1b4029
Merge with default