merge with upstream
authorBernd Petrovitsch <bernd@firmix.at>
Fri, 13 Jun 2008 18:07:53 +0000 (20:07 +0200)
committerBernd Petrovitsch <bernd@firmix.at>
Fri, 13 Jun 2008 18:07:53 +0000 (20:07 +0200)

Trivial merge