merge of '6ad5f744a0e10576da1d785da1a1f3f221137399'
authorMike Westerhof <mwester@dls.net>
Fri, 9 Mar 2007 00:08:41 +0000 (00:08 +0000)
committerMike Westerhof <mwester@dls.net>
Fri, 9 Mar 2007 00:08:41 +0000 (00:08 +0000)
     and 'f8e828833a5832ebccfdf10c0fe7b45d343a8ba0'


Trivial merge