Merge branch 'master' into harmattan
authorAurel Popirtac <ext-aurel.popirtac@nokia.com>
Wed, 9 Nov 2011 10:44:50 +0000 (12:44 +0200)
committerAurel Popirtac <ext-aurel.popirtac@nokia.com>
Wed, 9 Nov 2011 10:44:50 +0000 (12:44 +0200)
commit738ef7579347fd7c62d419c123273e150e9bed17
treec4c288625f22b745873afef2389889e8dd75653e
parent705e801521dc1d4d1ce777362cd4862e0a9c36ff
parent2838c362562775ff9aa05df835205b9ca648b2cf
Merge branch 'master' into harmattan