# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1352399743 0
# Node ID 337e1ceae82ebbc88e9e57de900b9a8eb7de18ba
# Parent  2498fa07212f0f49df2f12c59b52ebfcb121a7b3# Parent  380eea1f5add6c3e37e886ebdb5dd83dcadd01b8
Merge with stable