Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Tue, 20 Sep 2011 13:12:52 +0000 (16:12 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Tue, 20 Sep 2011 13:12:52 +0000 (16:12 +0300)
commita063f02f02fe596d78387f0889483586cfa62f45
tree63836552dc774393ff71c15a78ff4412f23e2dd4
parent096798ad8b8fa53b466799362f75184199d0fadf
parentbca451fc36eba4076a491ffc98ed0491effb9d5b
Merge branch 'master' into harmattan