Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Tue, 6 Apr 2010 08:49:26 +0000 (11:49 +0300)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Tue, 6 Apr 2010 08:49:26 +0000 (11:49 +0300)
commitd3b3718070c4078f801e9c7c78938cda3c711ed5
tree7540af9c6df3bbeb08cef096e0d83819255ebb6d
parent899784a823651baf5e96a96a2701962dd1e9396c
parentfd75e149a351d3adbd03de77bf027931f344fbb8
Merge branch 'master' into harmattan