merge of '9831ee83165ae726c1641da5b4f8f00b78674b85'
authorMike Westerhof <mwester@dls.net>
Tue, 17 Jun 2008 16:56:52 +0000 (16:56 +0000)
committerMike Westerhof <mwester@dls.net>
Tue, 17 Jun 2008 16:56:52 +0000 (16:56 +0000)
     and 'dc80ff7ef30fb0e742800d3342ca5811d15194dc'


Trivial merge