# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1195254202 0
# Node ID ca17c133d6c33383d990601bdbebb06dfc2b1c4c
# Parent  7b30d02a36aa59647be77380fbf2075d568884b5# Parent  9c3ddecda3ce326ac99ac16f58299ef3bf52c760
merge of '12ad71995f63338f624cb01c1e25710a0307ca31'
     and 'f656cfabc030952447ce96cc94dc83bb8b9ea0d6'