Merge branch 'upstream-svn' into upstream
authorBernd Zeimetz <bernd@bzed.de>
Sat, 21 Feb 2009 23:44:46 +0000 (00:44 +0100)
committerBernd Zeimetz <bernd@bzed.de>
Sat, 21 Feb 2009 23:44:46 +0000 (00:44 +0100)

Trivial merge