Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Sun, 19 Jun 2011 09:29:45 +0000 (12:29 +0300)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Sun, 19 Jun 2011 09:29:45 +0000 (12:29 +0300)
commitf36dac4369508f13ada82f3404c24862c838f65e
treeb82b12feb672884b153a57219eee9a55f2aa1d67
parent58c67321a46013c58275685c4377b9a0fd9a5598
parent8bff44d3aa98a4c65eb949eac0d1d6c7266d326f
Merge branch 'master' into harmattan