merge of '4d648f06e4933204091653ed17587d38c999acfa'
authorRobert Schuster <thebohemian@gmx.net>
Sat, 16 Feb 2008 15:09:23 +0000 (15:09 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Sat, 16 Feb 2008 15:09:23 +0000 (15:09 +0000)
     and '5596670ee48626efcac039deba2915700bb20e34'


Trivial merge