Merge branch 'master' into harmattan
authorDominic Velikakath <dominic.velikakath@nokia.com>
Fri, 21 Jan 2011 10:03:14 +0000 (15:33 +0530)
committerDominic Velikakath <dominic.velikakath@nokia.com>
Fri, 21 Jan 2011 10:03:33 +0000 (15:33 +0530)
commit4f0316e8fe91763208fa0a4e222802ce6535c539
treebb10fb005b20898aab93edf78470f971fe2aac07
parentc98ddfb9b5cff7e232346d2a3d47969b197a5e4a
parent84802b5c07129c748b3cc2220270504c2b856cc5
Merge branch 'master' into harmattan