# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1327332072 -3600
# Node ID cac01b4e4a6cdc597d2e0ec58f035b11badf4191
# Parent  91e083fab1a324c7f1813ccf3b7b4b7358aefe5c# Parent  2890e1f3d8e4358c39f58543c1c9fe5e85bfd038
Merge with stable