# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1266401718 -3600
# Node ID 4da6285efe4c55308ef18d9f16e9d530fafa489c
# Parent  9bdbae6007cbe4c33a983fff64410b9e5b0f1b44# Parent  26ca426a04e187a458c15e373f2353be68ebb7da
Merge with stable