# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1244580159 -7200
# Node ID b21f76520d40fca24acd506563375622988abad9
# Parent  098d7464c8e43fe657f0c2e9a76c8a739b93709a# Parent  197aeca9108ad368034a12aa26cc90183f55d83f
Merge with stable