merge of '8acf3d08d60b9f58e48ff7ad9fcdf8c9e034abc9'
authorRobert Schuster <thebohemian@gmx.net>
Thu, 10 Jul 2008 14:53:12 +0000 (14:53 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Thu, 10 Jul 2008 14:53:12 +0000 (14:53 +0000)
     and 'fb658027ee3ea092a27993cf5f5f80edb3ebc365'


Trivial merge