merge of '02dd7a3b7bfd0dca79e61d6886ac11d42cb3365f'
authorRobert Schuster <thebohemian@gmx.net>
Sat, 9 Feb 2008 03:16:57 +0000 (03:16 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Sat, 9 Feb 2008 03:16:57 +0000 (03:16 +0000)
     and 'd64471dd1489ebf7d567b0896f3f41d31aeabe1a'


Trivial merge