merge of '42fa696a594e3a4b211f213594277acc96fef947'
authorFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Sun, 13 Aug 2006 18:32:20 +0000 (18:32 +0000)
committerFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Sun, 13 Aug 2006 18:32:20 +0000 (18:32 +0000)
     and '7a6ef70c33357e83223926dab560ae66d6f41c7c'


Trivial merge