# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1219614292 -7200
# Node ID b395cf3c0d0a64bf45d5e895209bb0b1a9ad4913
# Parent  5c3637b12e8866c20dcd61ae20e133fc54676d5a# Parent  9cf55f18adad316d73913444531722c5665a9944
Merge with stable