# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1226700060 -3600
# Node ID 7d5c8c734b746ae5e40c5e0002cba007c693d449
# Parent  5cf987b0f3a1da6e430113ac6e18ef2e10daad31# Parent  a93358a05b8034a7ccc0961d10826eac99bdbcdf
Merge with stable