# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1338624599 -7200
# Node ID 64fc3d450713de74bf80fedfa0b4bddc22b454e5
# Parent  2a1ab2f6559cd954a881474d41cbedb6b318d4ba# Parent  2ba350253f7671c3b9d5fd7e9b8242bda9e1a14b
Merge with default