# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1285230838 -7200
# Node ID 2941e3ddd1b1f94bd79fbb848cda7b35522d0600
# Parent  13bba4066f900d7d626dd71be92333ef3f4c286f# Parent  630d72ae4f76566f0344d27180085ebaf14aa199
Merge with stable