Merge branch 'master' into harmattan
authorAlexander Akimov <ext-alexander.akimov@nokia.com>
Mon, 13 Feb 2012 10:17:42 +0000 (12:17 +0200)
committerAlexander Akimov <ext-alexander.akimov@nokia.com>
Mon, 13 Feb 2012 10:17:42 +0000 (12:17 +0200)
commitdfd3be10467a23baea8eb8f0c14af60ce8956ada
tree451cc9b5551401cd297a24acbee2c0c387a9c159
parent2b71bbe3d0c80bea7d39b9b56b74f7cf8e09ba76
parent62e24c5504961f6003cb0d8385015fc77bbc7db0
Merge branch 'master' into harmattan