Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Fri, 23 Jul 2010 09:03:56 +0000 (12:03 +0300)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Fri, 23 Jul 2010 09:03:56 +0000 (12:03 +0300)
commit474985b28f8b7d643137a71c4658fa7237399c2a
treebc4c0d31849c965a553a14bfa074940cd1658c72
parenta12b995e0e3a40f0196c30fde775627e55fe8003
parentb279a36d82cd6f6ef8a83995fad76f743356f1eb
Merge branch 'master' into harmattan