Merge branch 'master' into harmattan
authorAlexander Akimov <ext-alexander.akimov@nokia.com>
Fri, 21 Oct 2011 12:10:30 +0000 (15:10 +0300)
committerAlexander Akimov <ext-alexander.akimov@nokia.com>
Fri, 21 Oct 2011 12:10:30 +0000 (15:10 +0300)
commit35fc92a805a02b30856d72c715a73a82db1be5ca
tree18eb18600c08f06c12257655027b69f0fbc5d31f
parentfacad36054096154a7be08d46ef3e955566b68f5
parent36db2cc8db6025417061550f844c6aced9157057
Merge branch 'master' into harmattan