merge of '42098e571e50812e9146ed9ceaf3d271d88bca35'
authorMike Westerhof <mwester@dls.net>
Mon, 1 Jan 2007 20:52:25 +0000 (20:52 +0000)
committerMike Westerhof <mwester@dls.net>
Mon, 1 Jan 2007 20:52:25 +0000 (20:52 +0000)
     and '748c040de910c5316366a67ae82394039392fb50'


Trivial merge