# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1248601259 -3600
# Node ID 1d512632995b6d4c5c35860115fb465d30a09e17
# Parent  6e73db2016ab3c391225ca9f4fb1deb44a5c3063# Parent  b17b1cf1341af8637bad050a44955ba569b0c335
Merge with stable