# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1316010872 -3600
# Node ID 06a1ec674ee8a34b3a95ec7c4ae46d4d1d48701f
# Parent  d487504115fefcf8245e7b2eadbe24a9e7335884# Parent  639bb4617c704de72f61591be8563361c79634a7
Merge with default