Merge branch 'upstream' into maemo
authorHenning Heinold <heinold@inf.fu-berlin.de>
Thu, 4 Feb 2010 23:55:56 +0000 (00:55 +0100)
committerHenning Heinold <heinold@inf.fu-berlin.de>
Thu, 4 Feb 2010 23:55:56 +0000 (00:55 +0100)

Trivial merge