Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Fri, 14 Jan 2011 09:40:24 +0000 (11:40 +0200)
committerTomi Suviola <tomi.suviola@nokia.com>
Fri, 14 Jan 2011 09:40:24 +0000 (11:40 +0200)
commit52bd250491de275e675d5dfc7b3d81626b325a68
treedd533c45753912adfdc21549de0f9112d693e985
parent5e8797155d4b46be7c5ed5a125560b745567bd32
parent8fc945441cf1786940d2cd1693af678136fe7f2b
Merge branch 'master' into harmattan