# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1356103315 0
# Node ID f301599e705aa5192da378fc521d2cdd61be5c23
# Parent  ca46d3dccb19eccbf8b841301476c46ca31aec02# Parent  62cc0851c70f644f99de03abba11132873189965
Merge with stable