# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1253354441 -7200
# Node ID a718e9827510e9ed866b2466575a2e00b0db9161
# Parent  bf971e786e93960f19abccac99f34fe4705e2c79# Parent  0c7f033354c7030012bcffd780a1135cb750a15d
(stable) merge with default