merge of '1821f6eadefc14ad7ce51d5ab026da139608f557'
authorRobert Schuster <thebohemian@gmx.net>
Sat, 16 Feb 2008 15:09:09 +0000 (15:09 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Sat, 16 Feb 2008 15:09:09 +0000 (15:09 +0000)
     and 'b214e193f52c5b76dce3027376c5bd7eafce9971'


Trivial merge