# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1357833728 0
# Node ID 0cdba0354b87f747b0ca5c89fbb2fc333dc6d3c6
# Parent  5ac75dd311d5e374a8e9afe19f4b97793ce75242# Parent  ecb744c2a1995913900755cf7e4c4508eb628b54
Merge with stable