merge of '8c185e14edc5b4a26b15fd54f158e22f3f659282'
authorRobert Schuster <thebohemian@gmx.net>
Tue, 23 Sep 2008 06:32:19 +0000 (06:32 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Tue, 23 Sep 2008 06:32:19 +0000 (06:32 +0000)
     and 'c70fa985cd7a9e0166e70d97ccac1c7dd324fe8b'


Trivial merge