Merge branch 'master' into harmattan
authorAlexander Akimov <ext-alexander.akimov@nokia.com>
Tue, 4 Oct 2011 11:50:04 +0000 (14:50 +0300)
committerAlexander Akimov <ext-alexander.akimov@nokia.com>
Tue, 4 Oct 2011 11:50:04 +0000 (14:50 +0300)
commit0f9a817b2ba604cdc7c666c6247ac7d49298f148
treec09537cb192e340d8f9df0ac85509776a10a6203
parent39f6ba680fad6ca7bbaf7b6c74469007f399108b
parent234e1da6b0ac21e2c14d0cae97e336df03cce74c
Merge branch 'master' into harmattan