Merge branch 'master' into harmattan
authorAlexander Akimov <ext-alexander.akimov@nokia.com>
Mon, 17 Oct 2011 16:39:47 +0000 (19:39 +0300)
committerAlexander Akimov <ext-alexander.akimov@nokia.com>
Mon, 17 Oct 2011 16:39:47 +0000 (19:39 +0300)
commitb83cc3a5282fa7c32de47bf0eb6df4fcc96345be
treef142682865e0ede6f3fc30097ff21685f7a06752
parent86a4f8237f1cfdb438422ffd58fd831bf367ff86
parentb9572c9c50cf73f5aa3b3d9d8da21da3b7460cd5
Merge branch 'master' into harmattan