# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1245773564 -7200
# Node ID 58569d4d0aec7be02cf14043d3265a434fda9c19
# Parent  d5882243b1f97fb023b1da71a17ec9e682e879d7# Parent  763d20224433257e8e9f15e2175737a69683e3d5
Merge with stable