merge of '953ae6dd8d43a51ab7e93b1157fbb67ba0c6b42b'
authorRobert Schuster <thebohemian@gmx.net>
Sun, 27 Jul 2008 17:44:02 +0000 (17:44 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Sun, 27 Jul 2008 17:44:02 +0000 (17:44 +0000)
     and 'a7a11fde4813257fd795ba98b5cfa99942623f8c'


Trivial merge