# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1240310270 -3600
# Node ID fa7d7d6ca1adcfe82f0213595e9d179a10a86b4f
# Parent  09d1575f16c7f08259a6fa8eddcca4bc7d896e10# Parent  70220c2a4940620cff448955ebf954c2e3558ff0
Merge with stable