merged with main branch
authorHenning Rogge <rogge@fgan.de>
Fri, 30 May 2008 08:13:59 +0000 (10:13 +0200)
committerHenning Rogge <rogge@fgan.de>
Fri, 30 May 2008 08:13:59 +0000 (10:13 +0200)

Trivial merge