# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1287095805 -7200
# Node ID 55e4ea6d1c01a3582463f84803bc8bb106f8f009
# Parent  df93d61a7790e535f47b4d9c53862a1ad13bae16# Parent  12f6e285e4e7f33b358d1ed2555ab3a454025308
Merge with default