merge of '8003a3400630ec53f3ce15fc048a60a29d5e7bed'
authorRobert Schuster <thebohemian@gmx.net>
Mon, 28 Jul 2008 16:09:07 +0000 (16:09 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Mon, 28 Jul 2008 16:09:07 +0000 (16:09 +0000)
     and 'efd5f8a984f8580641b9e6e68ee6d933d93e6fc2'


Trivial merge