Merge branch 'master' into harmattan
authorDominic Velikakath <dominic.velikakath@nokia.com>
Tue, 25 Jan 2011 13:21:50 +0000 (18:51 +0530)
committerDominic Velikakath <dominic.velikakath@nokia.com>
Tue, 25 Jan 2011 13:21:50 +0000 (18:51 +0530)
commit754a4c5e53218bdb060bddb2574d754e4857dea0
tree141c9c86deb847f33c97754fc654b3174f785a37
parent0c6c206520d7335a67c7887e6e606aa03efc1eb7
parent0da7c18a323fcf7b85f9607d4a41f50649c852f6
Merge branch 'master' into harmattan