Merge branch 'master' into harmattan
authorAlexander Akimov <ext-alexander.akimov@nokia.com>
Wed, 2 Nov 2011 12:01:44 +0000 (14:01 +0200)
committerAlexander Akimov <ext-alexander.akimov@nokia.com>
Wed, 2 Nov 2011 12:01:44 +0000 (14:01 +0200)
commit1861b35af412df0fbf280553d2b08f4092596077
treeab4d8b5908c5e9ffcc525c76afd5bd950f532a4c
parented8c3deb6c5a6e94d15592ae4206b69d11a03564
parent6625958f13265e74b0ac2ad029495ba511a5e64a
Merge branch 'master' into harmattan