# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1356748554 0
# Node ID e4157fb1161d6e9f5772dabbbcceab698f0ddcfe
# Parent  f301599e705aa5192da378fc521d2cdd61be5c23# Parent  bcbe606f2bc6dd55f9a80d66802a41dacb895eb5
Merge with stable