Merge branch 'upstream' into maemo
authorHenning Heinold <heinold@inf.fu-berlin.de>
Mon, 18 Jan 2010 20:58:22 +0000 (21:58 +0100)
committerHenning Heinold <heinold@inf.fu-berlin.de>
Mon, 18 Jan 2010 20:58:22 +0000 (21:58 +0100)

Trivial merge