merge of '7d34cad8c1cc77f4e891350dd5960331ff47128c'
authorMike Westerhof <mwester@dls.net>
Tue, 7 Oct 2008 14:10:25 +0000 (14:10 +0000)
committerMike Westerhof <mwester@dls.net>
Tue, 7 Oct 2008 14:10:25 +0000 (14:10 +0000)
     and 'f8b5444079bbbbe46a1effb15957cc79e8753dca'


Trivial merge