# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1290455142 -3600
# Node ID b8755285ff1805a89557271070ac78cfe3b4289d
# Parent  c333552ec003b620cc38a7e2ee8c745d8b13e704# Parent  2cadbd48a31b12407dec5bba1a8e43cbcbd6a1b3
Merge with default