Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Wed, 1 Jun 2011 09:03:53 +0000 (12:03 +0300)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Wed, 1 Jun 2011 09:03:53 +0000 (12:03 +0300)
commit9944a36c34af85e7f6df637a3e438153df505b17
treeae33b45f390f8ee2b5ac61dc336eb5f149953a2a
parent715d11b3e8ec1a1cb7059c4208df4f500b5cd425
parent0735de772c7f0bbbd20e97d47027593c4fac1a5d
Merge branch 'master' into harmattan