# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1319294719 -3600
# Node ID 89f7a7e343c91a1a1da24eeaac3ec17ba7f8b2f2
# Parent  68475648cd7e889535bbc4e85be1992f48680fa6# Parent  e50f10baa81a9eb6897d42ac6fda1c3edf6801b3
Merge with default