merge of '2a9c44cdb5873b8f43feb32a28672dc98ff82666'
authorRobert Schuster <thebohemian@gmx.net>
Tue, 7 Oct 2008 23:50:20 +0000 (23:50 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Tue, 7 Oct 2008 23:50:20 +0000 (23:50 +0000)
     and 'dc0102fc89237b4da908e11a15fd36bef0dd2677'


Trivial merge