# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1271074376 -7200
# Node ID 5f71db3fe3b51962e0a34760613a6d213ebce2c2
# Parent  e73750804c3e272f27e52038a926e1699a622cda# Parent  676de4ffd778e2bccbdfe4f3e0bffffaf906e93c
Merge with stable