Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Tue, 19 Oct 2010 07:52:42 +0000 (10:52 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Tue, 19 Oct 2010 07:52:42 +0000 (10:52 +0300)
commitfa9d516f3bcc0d511ed9c721a7ddea4d0b0c9639
tree8a2afd3d401538a9ab9e4ba8440f3daa2f4b68a0
parentf60694989f9cb237384ec5f2d3a09e876bd4396a
parentdcf97d55abfdbb0278780b6ef22f9441d0aac95d
Merge branch 'master' into harmattan