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)
commitd774098d6f155738c7f4d119429a90a61baf3798
tree613c9f012dd15d3e55870496fa669644b3e4234b
parentc0487774f9be859984d24702a2e4d75e91742d8f
parent4f84874080ab5c73267b06ea9131aaab940c9e3c
Merge branch 'upstream' into maemo