merge of '1d06736abd89e6b42d2eaf5918fcd17ad518fcb3'
authorRobert Schuster <thebohemian@gmx.net>
Tue, 4 Mar 2008 16:46:11 +0000 (16:46 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Tue, 4 Mar 2008 16:46:11 +0000 (16:46 +0000)
     and '3601bc2cdb1e980ccaf4f1de781d948df8d45545'


Trivial merge