merge of '62144a4b95562050226f9f8a4ad6571ca02007e0'
authorRobert Schuster <thebohemian@gmx.net>
Thu, 4 Sep 2008 15:24:17 +0000 (15:24 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Thu, 4 Sep 2008 15:24:17 +0000 (15:24 +0000)
     and 'd2f5e4c14802c400e682b3a02a40e970d717a89b'


Trivial merge