merge of '1b3281155a76e1b96f9c232d53e0b275b6f50ef2'
authorRobert Schuster <thebohemian@gmx.net>
Tue, 19 Feb 2008 23:54:11 +0000 (23:54 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Tue, 19 Feb 2008 23:54:11 +0000 (23:54 +0000)
     and '6c23c9e30050d9acb0985e785f4d7b1a333c0dd6'


Trivial merge