merge of 'cb591f5b883733fa2368b93267c8b93a727fa2c7'
authorFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Sat, 19 Aug 2006 17:25:57 +0000 (17:25 +0000)
committerFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Sat, 19 Aug 2006 17:25:57 +0000 (17:25 +0000)
     and 'f9b2fe26aea3315e537bd3dccf2d89fb990f3b5d'


Trivial merge