# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1322117023 0
# Node ID 0350b6b64affde90ae90f2d3128ef3afbc5f2d80
# Parent  ab16e060541e87e63372eedc67b89b2d1a1b4029# Parent  8cbcb86e4fa86043962031fc0b9fe124a80b86d5
Merge with stable