Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Tue, 4 Oct 2011 10:13:45 +0000 (13:13 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Tue, 4 Oct 2011 10:13:45 +0000 (13:13 +0300)
commitd44d2bd59e3689ed9c6e47608d6c3841e7189e17
treeb9a02ee1845637abdc59a651ff13e443ac9e185b
parent2a438a423835a442590e2613c1f7dd18d010caff
parentd2e7494100e21c6b57ed9281735441b4dd923bfd
Merge branch 'master' into harmattan