Merge branch 'master' into harmattan
authorDominic Velikakath <dominic.velikakath@nokia.com>
Mon, 7 Feb 2011 09:29:29 +0000 (14:59 +0530)
committerDominic Velikakath <dominic.velikakath@nokia.com>
Mon, 7 Feb 2011 09:29:29 +0000 (14:59 +0530)
commit91682b04ef8672f666ce0e3fa55fbed5d51c08f6
treeb49646764a7874bc2960c90caf336376cb63c607
parent328a657642d5c6c9f1f271e38789b9f22700af62
parentb317ff3848432bdfce05686e68e49d8c96819644
Merge branch 'master' into harmattan