# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1288033218 -3600
# Node ID 1a00e2718cdec792651e64506b2a17b0df31a29a
# Parent  e5e1c16fe5b7c211276fee63bf2d09ec17d59154# Parent  d565787a8a5d504b88acc1931dbd4bd57645d108
Merge with default