merge of '396d43c9459edaab2f04c5dd3825de0391fc1b73'
authorRobert Schuster <thebohemian@gmx.net>
Mon, 14 Jan 2008 07:33:42 +0000 (07:33 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Mon, 14 Jan 2008 07:33:42 +0000 (07:33 +0000)
     and 'e4f83871a267ab0720e73ef096ce3ab5fc40a303'


Trivial merge