# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1312887403 -7200
# Node ID d487504115fefcf8245e7b2eadbe24a9e7335884
# Parent  a50ed14997fc1e9d2d285e8f74b125ac65fcd741# Parent  6cabb1c47f214fc0dad30240bcf0823f4c5906db
Merge with default