Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Sat, 30 Apr 2011 11:16:07 +0000 (14:16 +0300)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Sat, 30 Apr 2011 11:16:07 +0000 (14:16 +0300)
commit1ef1e53f4ad570f43f6ea0a90a68c519936b13cb
tree990c572947b47e5a06e9c53003d896cff4d2006f
parentc58e7ac50c8afcac7bc4be90d229dc7c009a33ae
parent2533115b2ca0e2ba6de1deccde114044b48b118c
Merge branch 'master' into harmattan