# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1286957926 -3600
# Node ID 908f0742e2801cdfc2b795069fd465b7a1d5a18b
# Parent  5a6898736b1a7b909f84dbb6faa8f8e4e389c652# Parent  c793c1a87f1cc203e4b8c4f790043a38400b7211
Merge with stable