# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1304705590 -7200
# Node ID eb234d5d695c1838bb5cebd4c939fdd5f1fb45dc
# Parent  95e99c4d10d315f5d7c9797ab01f7030c7d20df5# Parent  eb562ea207c3b2e300070779face6d4ac3f3f5e9
Merge with stable