# HG changeset patch
# User Martin Geisler <mg@aragost.com>
# Date 1308657626 -7200
# Node ID 0e64286760d5214d9046d1597a988e5bd1a05b52
# Parent  b1880474e3adb25d2242cb00005b872ce67e85b2# Parent  1ec8bd909ac3b570d5ffd196bd46d60b838c7148
merge with stable