# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1179353747 0
# Node ID 7b339edd9d74ea4a005bb5018c3a547c97bc660e
# Parent  60ca4431f8674fea10d7a10f1c55906230a42dc9# Parent  c0dd45834fd92c886f3737e3de255942c039cc2d
merge of 'b23501b21d88703543a15ac3d68dd5361966e503'
     and 'fdf973b430372c5786017618b9b7eecb5e37970a'