# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1292068150 -3600
# Node ID 67aaf09289bb4fd8281bc9f5c1c61f431b3d57ba
# Parent  d196d4ba75ef9b72abf7073fdcefa3afccaab00a# Parent  c2651cd808b7819f12b1d93091bd8ea4b3c0e41a
Merge with default