merge of '46876c0e449d95a41520ddd3b4b694e1d919dd4b'
authorMike Westerhof <mwester@dls.net>
Tue, 16 Oct 2007 15:26:36 +0000 (15:26 +0000)
committerMike Westerhof <mwester@dls.net>
Tue, 16 Oct 2007 15:26:36 +0000 (15:26 +0000)
     and 'afda8aa11a73621c3822525abaf21bc2c4b73ab7'


Trivial merge