# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1360841599 0
# Node ID 09f857c44abeb8a194d226c66d8d1778919944ce
# Parent  1a87bd40517cb119414a132c76faaee45eb54a45# Parent  192cebcd59a044b8cedcfe2db0bd0d1b5096186d
Merge with stable