merge of '78d052f85b4140a16dabac52589d626ae16d49b2'
authorMike Westerhof <mwester@dls.net>
Thu, 28 Jun 2007 14:38:44 +0000 (14:38 +0000)
committerMike Westerhof <mwester@dls.net>
Thu, 28 Jun 2007 14:38:44 +0000 (14:38 +0000)
     and 'd85165b6d72282ba94622c1c0d0c9c3e4a6be821'


Trivial merge