merge of 'd3c8a06d1d4f7abaf8f97964d82c9c0811415c68'
authorRobert Schuster <thebohemian@gmx.net>
Tue, 7 Oct 2008 21:08:36 +0000 (21:08 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Tue, 7 Oct 2008 21:08:36 +0000 (21:08 +0000)
     and 'e4568544a8390f2371814f5e9359920853e5b0b1'


Trivial merge