merge of '7c54b67a8bd06b0acd3de3732a00f6e1728ab4cf'
authorRobert Schuster <thebohemian@gmx.net>
Thu, 18 Sep 2008 08:52:54 +0000 (08:52 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Thu, 18 Sep 2008 08:52:54 +0000 (08:52 +0000)
     and 'bc39d5cfbb7f6b7e9356ec6176bb1d920b167f96'


Trivial merge