Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Wed, 25 Aug 2010 07:07:48 +0000 (10:07 +0300)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Wed, 25 Aug 2010 07:07:48 +0000 (10:07 +0300)
commit21cc1e19706e813ba05317c98103296a30a55992
tree0029ffc39c9a2e09c6faba3a1c0df66b1a84ff63
parente2d7e9ea0f4a1b46925a722a083de201fa931852
parent907a83b6c884316e84c974d19ac29691892e74db
Merge branch 'master' into harmattan