Merge branch 'upstream' into maemo
authorHenning Heinold <heinold@inf.fu-berlin.de>
Thu, 28 Jan 2010 10:15:15 +0000 (11:15 +0100)
committerHenning Heinold <heinold@inf.fu-berlin.de>
Thu, 28 Jan 2010 10:15:15 +0000 (11:15 +0100)

Trivial merge