# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1350078460 -7200
# Node ID 3222b5b93410d1d2f0c3f245cf59a63c27355f82
# Parent  4e2090ed2e72840e72de781fc47bef9ab7b7d53a# Parent  38b7bb8f1c85458984fe0b326a61d22017598c50
Merge with stable