# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1209410658 0
# Node ID 5c65b5df9bcc01da90224c4eec3c55c3bc8efa38
# Parent  8c3f6126759c9e65c0034fed02515d043672e656# Parent  d5fe9bd3c963723c49579aa9e526deca6e56b24b
merge of '5f1a220f63d8e85758a94a2ed57381dc91b07eda'
     and '9698269bb39cad1afe98da492d53fc909fe8d958'