# HG changeset patch
# User Florian Pose <fp@igh-essen.com>
# Date 1263334648 -3600
# Node ID 7e84f4c99fd097f389fe01454b05fee1593f52da
# Parent  020ad9ad3afbbabe3f68ef6cc1e25a88ddf5c05b# Parent  48c1f14b696bed49ae15bab89e0f3c27a405c6c8
merge