merge of '2aac24d666cd8e05063343fe31b3fda11d82ab9e'
authorMike Westerhof <mwester@dls.net>
Tue, 17 Jun 2008 13:48:15 +0000 (13:48 +0000)
committerMike Westerhof <mwester@dls.net>
Tue, 17 Jun 2008 13:48:15 +0000 (13:48 +0000)
     and '8a7d66394a2db576f5f945a59a113dfe1747df03'


Trivial merge