Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Sat, 30 Apr 2011 09:22:30 +0000 (12:22 +0300)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Sat, 30 Apr 2011 09:22:30 +0000 (12:22 +0300)
commitc58e7ac50c8afcac7bc4be90d229dc7c009a33ae
tree0bd133e20f801c3574c9c48ca603744d64eaa112
parent56dc8324dabc18a1138b80fc79ece59436f9eff9
parentdde8721e92435ef2bc7d1e48565fd1a623b86509
Merge branch 'master' into harmattan