Merge branch 'master' into harmattan
authordominic <dominic@dominic.apac.nokia.com>
Thu, 13 Jan 2011 14:10:39 +0000 (19:40 +0530)
committerdominic <dominic@dominic.apac.nokia.com>
Thu, 13 Jan 2011 14:10:39 +0000 (19:40 +0530)
commit591e3c2a40cf529169402a8034136371bea14933
treee24ee7e64e078e0cf566178fae0ef9577c88a8d1
parentb917b791dfb6cf8f6d74e2640997b2a27a598705
parent2c7398046bb3e555d6531dbd3e0d2860a40484fc
Merge branch 'master' into harmattan