# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1227688538 -3600
# Node ID ee27d91bacae98756eb75d6c5662450401f7634e
# Parent  d75b1455090e288ec75daa2233a27c9edd38913c# Parent  16b690351c0d4f2bbccfbf70d0f12901ff52267d
(stable) merge with default