# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1176947492 0
# Node ID d465bbc0f75952b9b0a383ad764d3a2d18a3d5d9
# Parent  1412d0e385580aae669b147818e36714e3f5b9bf# Parent  05e4f6e4137b709b38ab74a11867e9bb2e0af75e
merge of 'b6685c2c4de3ffbc988659fbfff2356c0835d2e3'
     and 'c75021df800d9d3868c01c7cefe076da60e0627f'