# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1360461088 0
# Node ID 1a87bd40517cb119414a132c76faaee45eb54a45
# Parent  fa2a1c11ae4b33e3d9718ad3b7d2019a5a393f6a# Parent  2ea362720f727e886d8292e388427cf716de89f1
Merge with stable