merge of '268be0267e1c3ec9b18df412f295a54d7b585493'
authorRobert Schuster <thebohemian@gmx.net>
Thu, 2 Oct 2008 15:10:32 +0000 (15:10 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Thu, 2 Oct 2008 15:10:32 +0000 (15:10 +0000)
     and 'bb914c20afa433b2a4deabb431a102dcf50cc0e9'


Trivial merge