# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1305632725 -7200
# Node ID 65b0318770d19d9fbc15b60363255c54984995e7
# Parent  c5c61ae378de992469b25203a4de5a14834133e8# Parent  23f0eeb598b5473e2a16170af17bfa8268faeecb
Merge with stable