Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Thu, 10 Mar 2011 12:20:19 +0000 (14:20 +0200)
committerTomi Suviola <tomi.suviola@nokia.com>
Thu, 10 Mar 2011 12:20:19 +0000 (14:20 +0200)
commitf8c3c66bbad06a063e2821e7bb0655f4eb3f7a8c
tree79a78028fbceaef23c110f0884619cc363b0497b
parent40b78b08a03a985d09ec9856eb58c6f82ff2db2e
parent471398748d6a7db9a0a7ca8d9becf7eab4d6daac
Merge branch 'master' into harmattan