merge of '65908f491852a7129b196ced660449bcc1933f90'
authorMike Westerhof <mwester@dls.net>
Mon, 25 Aug 2008 06:28:23 +0000 (06:28 +0000)
committerMike Westerhof <mwester@dls.net>
Mon, 25 Aug 2008 06:28:23 +0000 (06:28 +0000)
     and 'a7b7d4700cc3ecf7ecb70b8c6056d4e2dd721550'


Trivial merge