Merge branch 'master' into harmattan
authorAlexander Akimov <ext-alexander.akimov@nokia.com>
Tue, 13 Dec 2011 11:07:11 +0000 (13:07 +0200)
committerAlexander Akimov <ext-alexander.akimov@nokia.com>
Tue, 13 Dec 2011 11:07:11 +0000 (13:07 +0200)
commit06957c74f66356479e5541907e8552750515be63
tree3cb286141ef3c9b84a2d48a13233be25f930d1e0
parent230848555a2392e08028697e573bde45fe81752c
parentaf71dbf96954b16a84df32ad750550d17b484e5c
Merge branch 'master' into harmattan