# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1286623616 -3600
# Node ID 908e4fe6c1771f4842d84aad6292aa30323767a3
# Parent  8f2c2cc51789ddb3b5f8f5eac176552fb6e5f343# Parent  6d3f8caef3b31a2e7fc334bc99f2590aadda1055
Merge with stable