merge of '9851fa79590de88ec26cd9fb793c162054603016'
authorRobert Schuster <thebohemian@gmx.net>
Tue, 4 Mar 2008 19:56:38 +0000 (19:56 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Tue, 4 Mar 2008 19:56:38 +0000 (19:56 +0000)
     and 'c93306d4f46a3c6202a5b3d330190edb629f43ec'


Trivial merge