merge of '2fb25ef6fb3cb91ddaf8dd62069a538d6f50df58'
authorRobert Schuster <thebohemian@gmx.net>
Mon, 28 Jul 2008 12:15:52 +0000 (12:15 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Mon, 28 Jul 2008 12:15:52 +0000 (12:15 +0000)
     and 'c62ede010b1359ffbadc321f747e6f44d9a83dd5'


Trivial merge