merge of '032b986959813efab3fbef3ac58254ea62417eea'
authorRobert Schuster <thebohemian@gmx.net>
Fri, 6 Jun 2008 12:51:19 +0000 (12:51 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Fri, 6 Jun 2008 12:51:19 +0000 (12:51 +0000)
     and 'b099f51e6cdab1cf887a065a32d2951453ff375c'


Trivial merge