merge of '7d22e72b69f8f66fb6c9a1517dd341b70559cfc7'
authorRobert Schuster <thebohemian@gmx.net>
Tue, 7 Oct 2008 23:49:56 +0000 (23:49 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Tue, 7 Oct 2008 23:49:56 +0000 (23:49 +0000)
     and 'c82c3d791987b7feb095d7b6b0c12a52eef72fb0'


Trivial merge