# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1209420247 0
# Node ID 99cd68788bc01382257a0333e048645cfc7db029
# Parent  01e0ddc7e04018bed9c0e55399e834b70bd115a3# Parent  5c65b5df9bcc01da90224c4eec3c55c3bc8efa38
merge of '4c5110037671f84e3e775214c32692b5b23c11e1'
     and 'ce267e26db218ed48b76eb6ba6eda0e40cf170c7'