merge of '3725e0639f360f0af8007c241526006b0593ddd6'
authorRobert Schuster <thebohemian@gmx.net>
Thu, 25 Sep 2008 11:28:39 +0000 (11:28 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Thu, 25 Sep 2008 11:28:39 +0000 (11:28 +0000)
     and 'ef5ab979ea7d69bb029547198259524fbad530ec'


Trivial merge