Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Fri, 1 Oct 2010 11:38:35 +0000 (14:38 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Fri, 1 Oct 2010 11:38:35 +0000 (14:38 +0300)
commitf486dac5f9634d0f51d6582af37c93921e7ad123
tree4584848f0ecdbc0eb453c5318c1344fdc1af3fa2
parent03fcb2ea79afdb569772959c493045c1b8880dbc
parent08f5332293e8e1c078d744905a45c7095950a754
Merge branch 'master' into harmattan