merge of '3bebc77134894dd40e010ff3b797313fedecf370'
authorMike Westerhof <mwester@dls.net>
Wed, 15 Nov 2006 00:53:21 +0000 (00:53 +0000)
committerMike Westerhof <mwester@dls.net>
Wed, 15 Nov 2006 00:53:21 +0000 (00:53 +0000)
     and '9568f6da6fd237c9b27f9262d8beb1fcd92bd41e'


Trivial merge