Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Mon, 2 May 2011 10:58:17 +0000 (13:58 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Mon, 2 May 2011 10:58:17 +0000 (13:58 +0300)
commit61b692964b7056eec265133768f2cb074463cc72
tree563944aba358f51c30af31d5cac46160d37e7b39
parenteef00b2ecabe98f3dd110a702b70201cd66d4d2d
parent6a9e86a6ffd9a83cfe14d44b0e3a0aea52543e78
Merge branch 'master' into harmattan