merge of '0f180def591ca0179051e4ff04c293f2605e85e6'
authorRobert Schuster <thebohemian@gmx.net>
Tue, 4 Mar 2008 16:48:51 +0000 (16:48 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Tue, 4 Mar 2008 16:48:51 +0000 (16:48 +0000)
     and '189c4dd243d8f199a676c20a4429d103798ca95d'


Trivial merge