merge of '9706988717e3c2c70303850cb12a58843a12fa20'
authorRobert Schuster <thebohemian@gmx.net>
Tue, 7 Oct 2008 21:37:58 +0000 (21:37 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Tue, 7 Oct 2008 21:37:58 +0000 (21:37 +0000)
     and 'd6e042ee5309203ac2054f2cbb7ead6cb61a4e38'


Trivial merge