merge of '1fabadea24c36f83b75bb8e13e7fe5bd38d9a6ce'
authorFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Fri, 4 Aug 2006 14:31:10 +0000 (14:31 +0000)
committerFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Fri, 4 Aug 2006 14:31:10 +0000 (14:31 +0000)
     and '56f4d34b013075bf28441d0800516ac2d470fc8b'


Trivial merge