# HG changeset patch
# User haftmann
# Date 1238260681 -3600
# Node ID a06b4404632837485c97eb79e69136194fc105d2
# Parent  b3c851b0ea39526fc6872a680b2a14fc2fc7b2e9# Parent  b27d167e5e54ac3c32311ca6a620c122a401a500
merged