# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1269943693 -3600
# Node ID e73750804c3e272f27e52038a926e1699a622cda
# Parent  c118a9c5ca24efa874f2d0fa17ccdc88e7b41312# Parent  0cb61a4f5c5012ceb06e7831639a0377b86f8369
Merge with stable