merge of '414c6691b908eaab89fe4400b49ebf0e8d47aaad'
authorRobert Schuster <thebohemian@gmx.net>
Tue, 7 Oct 2008 23:43:18 +0000 (23:43 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Tue, 7 Oct 2008 23:43:18 +0000 (23:43 +0000)
     and 'e17edbd4fcc354c30505a8c14cdc5944260864f7'


Trivial merge