merge of 'c167fd3cbb5184fbfe56dff8fbb57e988ce58f51'
authorRobert Schuster <thebohemian@gmx.net>
Sun, 27 Jul 2008 15:38:11 +0000 (15:38 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Sun, 27 Jul 2008 15:38:11 +0000 (15:38 +0000)
     and 'c2418aed48373f06d423da2fe5a3d3fb44b61cdb'


Trivial merge