# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1352899500 0
# Node ID 0928d50a0abef37cc6fe718a969aabe12599c1c5
# Parent  337e1ceae82ebbc88e9e57de900b9a8eb7de18ba# Parent  ce884838a9558b646721366ad75dcb2b02dbf39f
Merge with stable