merge of '0ad856b6642c4e58968f9c79bca5829bd462a6c0'
authorFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Sat, 5 Aug 2006 21:35:42 +0000 (21:35 +0000)
committerFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Sat, 5 Aug 2006 21:35:42 +0000 (21:35 +0000)
     and '96934e2eb956677a752ad49c316475c88d042a67'


Trivial merge