merge of '3a46b29cc934022c7df085ba522531c57df6de56'
authorRobert Schuster <thebohemian@gmx.net>
Fri, 10 Oct 2008 14:47:38 +0000 (14:47 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Fri, 10 Oct 2008 14:47:38 +0000 (14:47 +0000)
     and 'b1dff4fe794bb68455321c0742b9a83e38afa5b3'


Trivial merge