# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1271146421 -7200
# Node ID 409e8ba906610e67fc305fef9153fa994547ebdf
# Parent  d01d3a15995ad2c7d71fe4a0bf56323cbca8b066# Parent  0614ba0295f6ddf5bba1a17b75c88e38694a9785
(stable) merge