merge of '0892eadc56b6091d6a37c303fe91fd0517a1b73b'
authorRobert Schuster <thebohemian@gmx.net>
Thu, 15 May 2008 14:56:39 +0000 (14:56 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Thu, 15 May 2008 14:56:39 +0000 (14:56 +0000)
     and '2e38a9a928f0ec2567bc2eec9569520ff428af3c'


Trivial merge