# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1299932395 -3600
# Node ID 5d6d605c93f80e9812ecf72978567fdb646ca890
# Parent  1fb7ab079d11694245048e9f21332f3c6cf23cd1# Parent  ddd525b7dd4acb77172200188d6fe359d929f8bf
Merge with stable