# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1304984649 -7200
# Node ID d2ee1f7d81f8b2931d36400b72f8f3aded4411e9
# Parent  eb234d5d695c1838bb5cebd4c939fdd5f1fb45dc# Parent  7a8ae4eb18bfb141615eb32f469764b0647e658f
Merge with stable