merge of '0b9c7a1af10fa25303941c4460dcc1743e6b58af'
authorRobert Schuster <thebohemian@gmx.net>
Sat, 9 Feb 2008 02:40:29 +0000 (02:40 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Sat, 9 Feb 2008 02:40:29 +0000 (02:40 +0000)
     and '7a40ab5c6b67885c69046e7758d912d768cd392b'


Trivial merge