# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1320846320 0
# Node ID f2a62458ef8bc4471d5224d33d3ac348b0744135
# Parent  d86b26020b4816665e6a31d34e068ac155580413# Parent  4fad25af75dd756ee260a0d6bc4d262f5fe79832
Merge with default