merge of 'c4d205026ddcefdc82f58f93c8d27038076dee50'
authorMike Westerhof <mwester@dls.net>
Thu, 28 Jun 2007 14:38:53 +0000 (14:38 +0000)
committerMike Westerhof <mwester@dls.net>
Thu, 28 Jun 2007 14:38:53 +0000 (14:38 +0000)
     and 'e5325ab8e47ca7688fb1a8e72b249d38ff3a7b4c'


Trivial merge