merge of '82673acfb73d52fea0af1765fcc388e06da120fe'
authorRobert Schuster <thebohemian@gmx.net>
Fri, 25 Apr 2008 10:22:02 +0000 (10:22 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Fri, 25 Apr 2008 10:22:02 +0000 (10:22 +0000)
     and 'b37044d8c845daa30d482ff54744391de3b55387'


Trivial merge