# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1229522120 -3600
# Node ID 55b462bc9343d55eedf9622e8d6e1d219793ae77
# Parent  9ea5ac3258b6c5549fa53dc94295dde0af192762# Parent  3fef0be9f5504e0d5422716520f27c550b47917c
(stable) merge with default