# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1306592215 -3600
# Node ID ad2d66fd14eec5132af5432844067bf102d6f623
# Parent  fee93dd51b18e7cb88aa26638056e3c716dfd69b# Parent  d1f0b4802c19d920a66f8063ecfdadf80a91cb22
Merge with stable