# HG changeset patch
# User Frank Benoit <benoit@tionex.de>
# Date 1239701850 -7200
# Node ID e296c4ee94ac81e486bdfca7ce54ca5aae477fa3
# Parent  635be320a5daf855ea053092b94fbe12d7f42f78# Parent  af948d4bbf8cf8e83fd975df79297f6d07dd727a
merge