Merge branch 'upstream'
authorBernd Zeimetz <bernd@bzed.de>
Sat, 23 Aug 2008 12:55:19 +0000 (14:55 +0200)
committerBernd Zeimetz <bernd@bzed.de>
Sat, 23 Aug 2008 12:55:19 +0000 (14:55 +0200)

Trivial merge