merge of '389484dfad182c53a2fb5eaf6187ed377f1f3cca'
authorRobert Schuster <thebohemian@gmx.net>
Wed, 23 Apr 2008 00:01:42 +0000 (00:01 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Wed, 23 Apr 2008 00:01:42 +0000 (00:01 +0000)
     and '7eb73c04272e5f591408e55a3e59c911bbdedd90'


Trivial merge