Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Tue, 23 Nov 2010 12:39:06 +0000 (14:39 +0200)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Tue, 23 Nov 2010 12:39:06 +0000 (14:39 +0200)
commit0a30e95039b53c625a9ca136a79b87fca6d691d2
tree759d897031a4f003d7a9ba2ee3b6fe2e866bb8d6
parent25eff0fd278ffa671976c8a72c2693fafa685718
parentddde957da521abb70cc5481fec5afa25b98283e9
Merge branch 'master' into harmattan