# HG changeset patch
# User Sune Foldager <cryo@cyanite.org>
# Date 1267624779 -3600
# Node ID b3db23a124ad181cef33e72c4627a7f144c0ad64
# Parent  d6c1279468ca89ae50b1fe23190f4bad931adeca# Parent  321a2aeb79a3e2ed4e1411ae09d076afd288fb02
Merge with default