merge of '28a6e903d35d148bb1e7c2790ec279ef7fcd3c3f'
authorRobert Schuster <thebohemian@gmx.net>
Mon, 6 Oct 2008 19:46:57 +0000 (19:46 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Mon, 6 Oct 2008 19:46:57 +0000 (19:46 +0000)
     and '3d6fcd7d68418bbc212dc9fd7fdeafae7ed7bbcb'


Trivial merge