Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Fri, 1 Apr 2011 08:30:37 +0000 (11:30 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Fri, 1 Apr 2011 08:30:37 +0000 (11:30 +0300)
commitaf7bda5f9b6e6a0d44b379f7d56c46028a68dfa5
tree2fab44c293ecea5db0e054dc11c0c9b38ea7ca4d
parent0a578721ec6e58919b36a970e34941bd403ed19e
parentb72c43463a05d58263299dc162780ab27b627ce2
Merge branch 'master' into harmattan