# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1218100834 -7200
# Node ID d06af25db8ca77ae8c1063e1a987c807c4af56de
# Parent  3989df387ff721bc31ea4c27ad9e16c82e614e18# Parent  18f235294dda58f5f5c1f8fd493bcc0eb840ab67
(stable) merge with default