merge of '5764283f87193bd83a2ef24e01c9e67092f8d2fe'
authorFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Fri, 4 Aug 2006 16:51:15 +0000 (16:51 +0000)
committerFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Fri, 4 Aug 2006 16:51:15 +0000 (16:51 +0000)
     and '77b06b624656c7090cf244c2827e774d111f39f3'


Trivial merge