# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1310629188 -3600
# Node ID 9c15f5c37707b54c6782db53e078a4582d4bc011
# Parent  82015736cc7eeead37ad50c96561ff7369719f6c# Parent  98fa0fa48b7d67f8023d8de39bc54d4a7b50b97e
Merge with stable