# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1274530249 -7200
# Node ID 8ab7289402a48de404aee546468d56953fe86f30
# Parent  6c99007688cec5f3f819d5fc3cfa4e373ec13304# Parent  fdbfecffd95b41f4227cb1da587d7154844b14a2
(stable) merge