merge of '182367713ac191bdb223491dafcf37c7cdac4f6b'
authorRobert Schuster <thebohemian@gmx.net>
Fri, 4 Jul 2008 02:16:25 +0000 (02:16 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Fri, 4 Jul 2008 02:16:25 +0000 (02:16 +0000)
     and 'bad7ee44fc1abb51074f3811644eace5a94dc013'


Trivial merge