# HG changeset patch
# User Christian Urban <urbanc@in.tum.de>
# Date 1260141216 -3600
# Node ID 5c1e6b896ff0f979ee9a8b24d2f48ba253764d4c
# Parent  cdc6ae1a4ed2a098ff6921e1aab654743139caa1# Parent  b16cac0b7c884a6b68bc2f52e8b9569dc129f5cd
merged