merge of '453683170be608ea537c8e9133e9808544d8ac3c'
authorRobert Schuster <thebohemian@gmx.net>
Fri, 8 Aug 2008 13:17:09 +0000 (13:17 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Fri, 8 Aug 2008 13:17:09 +0000 (13:17 +0000)
     and 'dd27045343c0a4288e8141f6cd9ce76afdd583b2'


Trivial merge