merge of '06439bd12faeb366d7d703a017d5c609d41cb96e'
authorMike Westerhof <mwester@dls.net>
Tue, 7 Oct 2008 14:10:11 +0000 (14:10 +0000)
committerMike Westerhof <mwester@dls.net>
Tue, 7 Oct 2008 14:10:11 +0000 (14:10 +0000)
     and '8334fa112d76dd1bff6086d9cbd2007755c42e05'


Trivial merge