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)
commit23baee7c5fe0c0c9a89f15e163972b674e79c884
tree3df7b74b03d035abacc758d1be1651cecd78994f
parent854aac7792a382ed87841d85f7a56d7324b108c0
parent131b8f9e3dd00b3b438414424e4121db36588fba
Merge branch 'upstream' into maemo