# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1304270311 -3600
# Node ID 95e99c4d10d315f5d7c9797ab01f7030c7d20df5
# Parent  08aeedc73cb7ad3bb83f3177aa8ee869d6faf3be# Parent  f4903069a2153157f9fafb7c65b51f088a1c8f49
Merge with stable