Merge branch 'master' into harmattan
authorDominic Velikakath <dominic.velikakath@nokia.com>
Fri, 3 Jun 2011 11:29:14 +0000 (16:59 +0530)
committerDominic Velikakath <dominic.velikakath@nokia.com>
Fri, 3 Jun 2011 11:29:14 +0000 (16:59 +0530)
commitff242ff7a38fbc17aeb53eef38db1f306f2f9afd
tree0feb76e5354375d4ee955f9ca19f553a2fa9e63c
parent84c2a51d025935836643b2f6063e61c4e7e0ac9f
parent1dbbd850a1dae4c43c3eec724c07d19aa6923672
Merge branch 'master' into harmattan