Merge branch 'master' into harmattan
authorAlexander Akimov <ext-alexander.akimov@nokia.com>
Fri, 9 Dec 2011 07:50:31 +0000 (09:50 +0200)
committerAlexander Akimov <ext-alexander.akimov@nokia.com>
Fri, 9 Dec 2011 07:50:31 +0000 (09:50 +0200)
commit1264723c96de7aee054ff453b32989247c3bc7a2
tree4fd36d5f7eefacc95b4495db5e10684cc87b7bb7
parent0d5dd0dea9355a0c3dbd5d3c2b1b5594fccf6b4b
parent0ca3483646698d244ca6506f5f30773eff517739
Merge branch 'master' into harmattan
lib/tests/test.cpp