# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1240392509 -3600
# Node ID aa3d951d2f1a25010f41a1ce9840c4c8fbe3ed4f
# Parent  fa7d7d6ca1adcfe82f0213595e9d179a10a86b4f# Parent  43d8c042ca2025b9f04f546a890db14212559c7d
Merge with stable