Merge branch 'upstream-svn' into upstream
authorHenning Heinold <heinold@inf.fu-berlin.de>
Sun, 17 Jan 2010 20:00:50 +0000 (21:00 +0100)
committerHenning Heinold <heinold@inf.fu-berlin.de>
Sun, 17 Jan 2010 20:00:50 +0000 (21:00 +0100)

Trivial merge