merge of '15600ad0d3a82ce2f192b1a9b6e4dde4c8feb9bd'
authorRobert Schuster <thebohemian@gmx.net>
Mon, 6 Oct 2008 14:07:16 +0000 (14:07 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Mon, 6 Oct 2008 14:07:16 +0000 (14:07 +0000)
     and '4de558cb0dc7b78f343b4ed887c11a0758157eb6'


Trivial merge