Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Fri, 30 Jul 2010 10:53:17 +0000 (13:53 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Fri, 30 Jul 2010 10:53:17 +0000 (13:53 +0300)
commit8eb02643fda961b71cb14be3da779865c07d99cf
treec2f591dcc51a399c5d2dc57058a6fdd647157732
parent00c3d4d5c876f85ebfbc48d6cdc2022dda707ba5
parent6f6cb097d5cc6f862777f6b96860a12a38425eaa
Merge branch 'master' into harmattan