merge of 'c1a81a9f8ce5ecb75232b4be49a91f4f1a0e19a0'
authorRobert Schuster <thebohemian@gmx.net>
Thu, 10 Jul 2008 14:52:41 +0000 (14:52 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Thu, 10 Jul 2008 14:52:41 +0000 (14:52 +0000)
     and 'f25e95db78aa5e69fe6e1ce592806448ba1dfe00'


Trivial merge