Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Tue, 27 Jul 2010 06:53:33 +0000 (09:53 +0300)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Tue, 27 Jul 2010 06:53:33 +0000 (09:53 +0300)
commit45a64d57245a33d44a0f94ae5c7343278fb0ace2
tree6a65e747d7754e45bcb56afc6c9cffc3af3899e8
parentd3431548878a1755a848bd94fb233c4c404fc12f
parentc400add200aad03284ea3d534fa24869f616e62f
Merge branch 'master' into harmattan