# HG changeset patch
# User Heiko Schlittermann <hs@schlittermann.de>
# Date 1264025479 -3600
# Node ID 6432e90cc34d4fba7c9bb97df7c870b7b76672d8
# Parent  39421a9700c5e9d0f51652ec4c344a75f8ae725d# Parent  8f9e45f83a656cb40b80231b6e42c2d0087c9c7b
merged from default