# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1354147179 0
# Node ID ca46d3dccb19eccbf8b841301476c46ca31aec02
# Parent  0928d50a0abef37cc6fe718a969aabe12599c1c5# Parent  d38c648869bbdafe8437c3a330170262561dda52
Merge with stable