merge of '3587630593a79216e232d374599557752a9f4599'
authorRobert Schuster <thebohemian@gmx.net>
Sun, 13 Jul 2008 12:30:21 +0000 (12:30 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Sun, 13 Jul 2008 12:30:21 +0000 (12:30 +0000)
     and '7c8aefb2dc76eb1b63e431ae3f5f37dbafad3425'


Trivial merge