# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1227633234 -3600
# Node ID d75b1455090e288ec75daa2233a27c9edd38913c
# Parent  a93358a05b8034a7ccc0961d10826eac99bdbcdf# Parent  51296bd1652f83e08a641eda94409e1169cd8ca3
(stable) merge with default