Merge branch 'master' into harmattan
authorAbhijit Bera <abhijit.bera@nokia.com>
Tue, 14 Jun 2011 12:54:55 +0000 (18:24 +0530)
committerAbhijit Bera <abhijit.bera@nokia.com>
Tue, 14 Jun 2011 12:54:55 +0000 (18:24 +0530)
commita37be5e98df9b3cd14023c0292baa804ff51f55d
tree94ff2e350de449283922593e1affc1462404af2c
parent89fa831b191e69ee4f0aa9a9134af7e7931603aa
parentce107703ccebc6c196db7dbc856639552f0594c9
Merge branch 'master' into harmattan