merge of 'b0ae8d7e97486b45257d7443b82c3e7bd318a2a9'
authorRobert Schuster <thebohemian@gmx.net>
Thu, 15 May 2008 19:31:09 +0000 (19:31 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Thu, 15 May 2008 19:31:09 +0000 (19:31 +0000)
     and 'c623b8256cde670674edff5cc4131f32826906df'


Trivial merge