# HG changeset patch
# User Florian Pose <fp@igh-essen.com>
# Date 1232965853 0
# Node ID 08060693df3761d894402d443735791200bae8ef
# Parent  10fbef0a3ac518552b4e9f2e1ce30c6828c6c0b1
merge -c1601 branches/stable-1.4: Ignores.