merge of '7712d9178e2d4268d697de3c404c8853aa202089'
authorMike Westerhof <mwester@dls.net>
Tue, 4 Mar 2008 04:11:14 +0000 (04:11 +0000)
committerMike Westerhof <mwester@dls.net>
Tue, 4 Mar 2008 04:11:14 +0000 (04:11 +0000)
     and 'b5b172da8f4d106e9070dd4957c42f3fea343e87'


Trivial merge