merge of '277f2a83646d0f7a24e0b10b4d24642817d8c5ed'
authorFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Fri, 8 Sep 2006 21:04:32 +0000 (21:04 +0000)
committerFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Fri, 8 Sep 2006 21:04:32 +0000 (21:04 +0000)
     and '8e2f55d069989cbd21cd91eaff2dc3fdaa40a40c'


Trivial merge