merge of '1cf701ebedabbcfca1fb1b88f2077258b1dfd000'
authorRobert Schuster <thebohemian@gmx.net>
Mon, 22 Sep 2008 21:57:29 +0000 (21:57 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Mon, 22 Sep 2008 21:57:29 +0000 (21:57 +0000)
     and 'a98ceb1ca1f8e3c0a1ec71c346fb532e467f3634'


Trivial merge