Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Sun, 19 Jun 2011 07:56:59 +0000 (10:56 +0300)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Sun, 19 Jun 2011 07:56:59 +0000 (10:56 +0300)
commit829417f4fa982cb5fc217d1157cf8df518f9196e
tree86816c5b3a12a418ac1ef1905b192986a90c78db
parent1f9e66ae1d56dc692e163bb187e39dc3be8c0277
parentd6aa33de5c3b40aae5631dbab048d9cbcc238466
Merge branch 'master' into harmattan