# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1267998481 -3600
# Node ID 44d25db950b45cb1d6579b65198311534d0acc17
# Parent  17528ccdaa1574aa47eef652c28abf5609243c6b# Parent  13bb123ad8945a3653f67a3508f8c6c351edb0e3
(stable) merge