# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1346339883 -3600
# Node ID feb663195388a4e918f5073d4159705ea599e8f7
# Parent  d76328c84f3ed0dd1c91f8ba6f00c917c0e5d1a0# Parent  f4dcce73f36243502cc4c89f81c910187860e097
Merge with stable