# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1224961422 0
# Node ID 9ebd288d7b77306151d48f8cf9b26d87f00b66fa
# Parent  1c54a5dc831f6b405c4ec9229fb17de45be0b098# Parent  7ed27ecdab51ec9551af6b91b48a4a22f120d5ef
merge of '1f22186ba9290bcae0deaea09d4fd38867f773e6'
     and '8887c6d877944752bc2756d893d9b0acc81277a8'