merge of '233bbfa6009ef8bfd4c0cf83a114892b0f99fc16'
authorFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Fri, 4 Aug 2006 15:23:17 +0000 (15:23 +0000)
committerFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Fri, 4 Aug 2006 15:23:17 +0000 (15:23 +0000)
     and '3491d9f296a401cc5eedae873334c80e480f7901'


Trivial merge