# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1242344270 -7200
# Node ID 492234da500baa7b77efabd8f279e957c3e8c544
# Parent  69c9e89471ae23e0d41b09e14d6a8e3cbb684728# Parent  72477fcc575b65e01298d5d92ef4a4f2728a9a86
Merge with stable