merge of '613d006a5a3c8c6629c2a0b9a905bfc4a80484ca'
authorRobert Schuster <thebohemian@gmx.net>
Mon, 23 Jun 2008 14:36:08 +0000 (14:36 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Mon, 23 Jun 2008 14:36:08 +0000 (14:36 +0000)
     and 'a3eb44219589b14fd5179c429a3888832e77379a'


Trivial merge