Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Tue, 3 Aug 2010 07:48:47 +0000 (10:48 +0300)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Tue, 3 Aug 2010 07:48:47 +0000 (10:48 +0300)
commit9fd41cf61e6dc229d6fe53e788b4fdf13bdb057c
tree976b9122e728a50085b13a7d47c9391ee73ede10
parent64167da97f31b99d59a6d15460e70ff70fe764aa
parentb98a395a2505ff259a1d74fa8240b895f7c68a7a
Merge branch 'master' into harmattan