# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1323385800 -3600
# Node ID 1321f8629e893f3c59b747cd4be0248009153d85
# Parent  0350b6b64affde90ae90f2d3128ef3afbc5f2d80# Parent  53da6702a77f2e7125d4f667b8c1373078d20718
Merge with stable