# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1224355872 -7200
# Node ID fcaea85fcf8defbf57fc7e9b266126615c7ebfce
# Parent  b741dc506a4c578bfc75caa69be055da7720de76# Parent  b87669cce5afdca0ee0c910d50760767bb74d715
Merge with stable