merge of '41f08fea37c410bb9ff7093f2c2d35572c69171c'
authorFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Sat, 12 Aug 2006 16:40:34 +0000 (16:40 +0000)
committerFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Sat, 12 Aug 2006 16:40:34 +0000 (16:40 +0000)
     and 'b2242c9c486da6354ad533ce32c14a76e3ef9b69'


Trivial merge