merge of '57cc0ea5ac2c9fcb954fde9648313ceb7c4c1289'
authorRobert Schuster <thebohemian@gmx.net>
Thu, 15 May 2008 14:56:24 +0000 (14:56 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Thu, 15 May 2008 14:56:24 +0000 (14:56 +0000)
     and '5a2c2dc85911ec398a156e49ad35c17c5534442f'


Trivial merge