Merge branch 'master' into harmattan
authorDominic Velikakath <dominic.velikakath@nokia.com>
Tue, 31 May 2011 11:32:18 +0000 (17:02 +0530)
committerDominic Velikakath <dominic.velikakath@nokia.com>
Tue, 31 May 2011 11:32:18 +0000 (17:02 +0530)
commit66b361c66a1c92d77274eb1f4d549a0657299cb4
tree64d9f08c5595a4dbd2413c58ce18389d4ec2467e
parentc6d2551a56dd47d17d8e95a38c2a33fd7a6cac52
parentbc5d8b899a0c80e662125cb5960bc1031a9aa3e0
Merge branch 'master' into harmattan