# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1247007771 -7200
# Node ID 894fa61f2e0bb88d03334ed8c7458e8a1463174e
# Parent  474063ef3f3d2ca6f203a6955852b60054320a85# Parent  75621fa839fbfd1467468ff9cf85db07a38269ea
(stable) merge