# HG changeset patch
# User Heiko Schlittermann <hs@schlittermann.de>
# Date 1295739015 -3600
# Node ID 0e1e5027e9c09113c3c9f540a4bcd9ad0b815ea2
# Parent  53c95f2ff0ac1233dacc8df303860f3413d5f6d4# Parent  6d624831079fd01f972fc49ab76797c9ac52e87b
merged