# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1273072560 -7200
# Node ID eb7991ee81ddfa0fe8b48ff965a5b1751c8da554
# Parent  72a272f1f7562b3527016916a9fa67f5d47e0e50# Parent  25235530940d61328e0655486009c4fea9e8c18a
(stable) merge