# HG changeset patch
# User haftmann
# Date 1259933664 -3600
# Node ID 78c0842510cbb248518f8ef9bee34a9a4be3f29e
# Parent  daf65be6bfe51c8a9f314f3c4fd6247dfbe98a80# Parent  5e9ddf000d97b86ef5d40a1a0e874bebe0e8f503
merged