Merge branch 'master' into harmattan
authorDominic Velikakath <dominic.velikakath@nokia.com>
Tue, 29 Mar 2011 11:29:14 +0000 (16:59 +0530)
committerDominic Velikakath <dominic.velikakath@nokia.com>
Tue, 29 Mar 2011 11:29:14 +0000 (16:59 +0530)
commit5c930a16333889f403238cd586195ed5d67d8d02
tree129cedec95825f6718bf997ee9c04bdb38e6629d
parentc373ca783b95e6a9a7ca2bd7bf6348b95f51fb78
parent014dc4db55a486e5e7d09be473b19b384ac8e1bf
Merge branch 'master' into harmattan