Merge branch 'master' into harmattan
authorAlexander Akimov <ext-alexander.akimov@nokia.com>
Fri, 28 Oct 2011 09:54:05 +0000 (12:54 +0300)
committerAlexander Akimov <ext-alexander.akimov@nokia.com>
Fri, 28 Oct 2011 09:54:05 +0000 (12:54 +0300)
commit699919749199aa3fa2be51dbf7c8aafd9f5da605
tree302ada9e03ed36b421008600de383907a47cb9da
parent56a00e7fd7df245505c7485c47446587a7dc702e
parent52cc5662ba6bc2b4a30aa62cde6d7c2edb42cea5
Merge branch 'master' into harmattan