merge of 'ba2394dc8bed77043b229f3e5c42b4b69aeca918'
authorRobert Schuster <thebohemian@gmx.net>
Fri, 6 Jun 2008 13:25:19 +0000 (13:25 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Fri, 6 Jun 2008 13:25:19 +0000 (13:25 +0000)
     and 'e8b3409511829c8c35d2859b5756d0206fbb3016'


Trivial merge