merge of '57913c45a2b8c01ec5a3c8f98a39b2fa258c0ffd'
authorRobert Schuster <thebohemian@gmx.net>
Sat, 20 Sep 2008 14:55:34 +0000 (14:55 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Sat, 20 Sep 2008 14:55:34 +0000 (14:55 +0000)
     and 'a69b0bec8beda161bec0b42502e802bb276444ea'


Trivial merge