merge of '36dc1826480be70d657adcad4878a3f6f3e9092f'
authorRobert Schuster <thebohemian@gmx.net>
Wed, 19 Dec 2007 17:24:57 +0000 (17:24 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Wed, 19 Dec 2007 17:24:57 +0000 (17:24 +0000)
     and '558c5b83f962e73a6166add223c6cb648a1fe2ab'


Trivial merge