merge of '4eddb76e20fc3f617d5ec1ab12fa2173a2f4ad69'
authorRobert Schuster <thebohemian@gmx.net>
Thu, 21 Feb 2008 12:51:07 +0000 (12:51 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Thu, 21 Feb 2008 12:51:07 +0000 (12:51 +0000)
     and '84a9e4169931ed6f2303a8862436f59c2141ca7d'


Trivial merge