merge of 'a17b5ac6bf09c1cfe29c784e2b1497684e1832ca'
authorRobert Schuster <thebohemian@gmx.net>
Wed, 20 Aug 2008 00:32:13 +0000 (00:32 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Wed, 20 Aug 2008 00:32:13 +0000 (00:32 +0000)
     and 'b1c5c4bee3ccfe87f1e42ab909186c7db359dd0e'


Trivial merge