Merge branch 'master' into harmattan
authorAlexander Akimov <ext-alexander.akimov@nokia.com>
Fri, 23 Mar 2012 10:10:13 +0000 (12:10 +0200)
committerAlexander Akimov <ext-alexander.akimov@nokia.com>
Fri, 23 Mar 2012 10:10:13 +0000 (12:10 +0200)
commite240290b340478aba91b7856b1b29aa092027dff
treea0e190870b180f66bdd5a9f48a7eb17d0a0d92b7
parent364069db4178ee87c74460cdb828f3bcdbc44b2a
parent0d912641219b7ac0b9aef1a4ce09f7505626e7ff
Merge branch 'master' into harmattan

Conflicts:
lib/tests/test.cpp
lib/tests/test.cpp