# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1275851964 -3600
# Node ID 6d948926515b7ae3f4ee03cd7acb0fab84b8f74e
# Parent  8ab7289402a48de404aee546468d56953fe86f30# Parent  8cab71dc5725cd4eddead17e2c4e88e5eda5a442
(stable) merge