# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1338852053 -3600
# Node ID 06fb629c6195b8e4cbe81d3bee1f5c1673b2c8ae
# Parent  2ba350253f7671c3b9d5fd7e9b8242bda9e1a14b# Parent  a2e8ccb652249a8ba0a0447894457833c7aeb799
Merge with stable