Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Sun, 19 Jun 2011 08:10:59 +0000 (11:10 +0300)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Sun, 19 Jun 2011 08:10:59 +0000 (11:10 +0300)
commitbcc3b7ce529a9869f1de88b66a69aee8b7bf097d
tree42267767724564c78601cc0e846a16f92a198abb
parent829417f4fa982cb5fc217d1157cf8df518f9196e
parent5088f7dadf3482462e3c3db821bc81606734b487
Merge branch 'master' into harmattan