merge of '72f3c1ab1f4863f49829ab72e6b3206f7c8720b0'
authorFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Sat, 12 Aug 2006 12:01:32 +0000 (12:01 +0000)
committerFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Sat, 12 Aug 2006 12:01:32 +0000 (12:01 +0000)
     and 'c9babd5c890d03ff3a5fa5b385b89471d91b1cc0'


Trivial merge