merge of '3ae2147ae0e9236010d06c67528feb145315c5bc'
authorRobert Schuster <thebohemian@gmx.net>
Fri, 10 Oct 2008 14:05:39 +0000 (14:05 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Fri, 10 Oct 2008 14:05:39 +0000 (14:05 +0000)
     and 'fec4aa4ddc77b0de8b5e9fb5b93866952af41d0f'


Trivial merge