# HG changeset patch
# User koda
# Date 1308558980 -7200
# Node ID e6b1a11c15e82f5562b75b151014621876991b0a
# Parent  5e6f5373f6860ba2b0d3e2c4f26cb0c90c803392# Parent  2db030882bc90144f546f800fc702ee8211f0a0e
merge Zorg's changes