# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1188825244 0
# Node ID 46fd9b9a667dbfeb1565a619c8c0d7cd5fd4252c
# Parent  e6364b0679b0c66945ef56008b71539b8cd1d703# Parent  f96cceb75fbb14e327b80b25e79df1c9d3c39392
merge of '53adc628daffd84d86a821ded6220ad682da5d53'
     and '9a8c71b5c3a886c3442980963cc58370653be9ed'