Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Thu, 5 Aug 2010 12:54:21 +0000 (15:54 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Thu, 5 Aug 2010 12:54:21 +0000 (15:54 +0300)
commit978889c8dd96a5306a1330398bb575fcb85c7ae0
treeb39c8d1796260d3f6aea31a9e20e6e6d93a73bec
parent735f4b183a0a5f91340a137305e9781806556223
parentff28d27cfb1fe5d2e981f1f167e1c9e70c5bb071
Merge branch 'master' into harmattan