# HG changeset patch
# User mf0102 <0102@gmx.at>
# Date 1188072524 -7200
# Node ID 30d801bbac7fa18b919844490bc58041a6dfcdd6
# Parent  934fd128126986f8a69462e92eb2ba56293b8220# Parent  b040e6b61b554498bff6c78836e7800ed2cf3564
merge