# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1281775661 -3600
# Node ID c7a471b4981986f416019e446182c2090e7d59ec
# Parent  9f939fae8ff3365d86359fdcda60f2e4be746b2c# Parent  4c37b26c549c47c0aadc378e57d0db8f3e20630f
Merge with stable