Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Mon, 13 Jun 2011 12:14:07 +0000 (15:14 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Mon, 13 Jun 2011 12:14:07 +0000 (15:14 +0300)
commit7808d0c91a23fd021b549dabc025b7279d12b994
treea249b8d02069f2e9fd262594ac8c17c751d8179b
parent4a6ddd773aec34ee9cf019ec2daad64f10343b61
parenta96e6137937fac98bedaace1d7564b098c46cea3
Merge branch 'master' into harmattan