merge of '521ac5658b53e3b348b3e85852c99f684ac9e8d3'
authorMike Westerhof <mwester@dls.net>
Thu, 4 Jan 2007 06:27:09 +0000 (06:27 +0000)
committerMike Westerhof <mwester@dls.net>
Thu, 4 Jan 2007 06:27:09 +0000 (06:27 +0000)
     and 'ca40d35221cc8bdac2ca608b0449df2559183f6a'


Trivial merge