# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1285192017 -7200
# Node ID 13bba4066f900d7d626dd71be92333ef3f4c286f
# Parent  12eadf33cce1c80c45ecb7e89153ae4f15fa3d8f# Parent  234c4314c6a42f5cec8f614078601085e54d7d9c
Merge with stable