# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1350487188 -7200
# Node ID 4139577a1e2aecf1c9b558135dacdeb21746f3a2
# Parent  3222b5b93410d1d2f0c3f245cf59a63c27355f82# Parent  446f29d6074926cd4d7f3f6a9502bf897f1470fc
Merge with stable