# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1244331063 -7200
# Node ID f6af6e74261248b32d8d824213d7993f7a923879
# Parent  05cf88057fc5c769249a790e28ef2bbfc2d54ade# Parent  e86eaa71219d0dd211718005b3587bd0883dbfe3
Merge with stable