merge of '82b5799fa84f05f84e4567892ec02e1793da418f'
authorMike Westerhof <mwester@dls.net>
Sat, 21 Oct 2006 22:02:57 +0000 (22:02 +0000)
committerMike Westerhof <mwester@dls.net>
Sat, 21 Oct 2006 22:02:57 +0000 (22:02 +0000)
     and 'cd6bceda2ad72ef7c9618be5c991fe044857be92'


Trivial merge