# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1195254052 0
# Node ID 8d8f06962b65fecec849210364fce8f750ceb41c
# Parent  200afe30b7aff9a7c80558935961371b31851c2a# Parent  58b486da43f3777e705cd7536ba012e2e161fdfd
merge of '2b4dccc8587d65d95c8698baa12619b506cec2f7'
     and '527398089a51964bc40642c9b6b7a977618f5c58'