Merge branch 'master' into harmattan
authorDominic Velikakath <dominic.velikakath@nokia.com>
Thu, 9 Jun 2011 05:40:09 +0000 (11:10 +0530)
committerDominic Velikakath <dominic.velikakath@nokia.com>
Thu, 9 Jun 2011 05:40:09 +0000 (11:10 +0530)
commitbcd6b0d33fc03cf7af5b22c717d8f6e9965e3ab9
treece296d98d7d8733a1910c3cd397e754176dbe599
parent65e31055b73734329a4b7b779f0c7db2b4acce8c
parentff9697a7d2042b4141e2f57df1c2fbfd4daaa291
Merge branch 'master' into harmattan