merge of '25b373bd9d80f07fcb709bdf80c6683debe5e46c'
authorRobert Schuster <thebohemian@gmx.net>
Tue, 16 Sep 2008 13:17:00 +0000 (13:17 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Tue, 16 Sep 2008 13:17:00 +0000 (13:17 +0000)
     and '9ba4295a48a42020cb433b5bca58e7fb702432d9'


Trivial merge