# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1291279441 -3600
# Node ID d196d4ba75ef9b72abf7073fdcefa3afccaab00a
# Parent  d51c3fd4e34a076083511760f16d9bb220dc2352# Parent  16cfcb56859ac355d8228333f8d4566d903d7f01
Merge with default