Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Thu, 3 Mar 2011 05:07:35 +0000 (07:07 +0200)
committerTomi Suviola <tomi.suviola@nokia.com>
Thu, 3 Mar 2011 05:07:35 +0000 (07:07 +0200)
commitfe78978757df3ebc8e69d55d9fc8815645062902
treef94f3348694d9dcebbd04dce75c81182d2dd9c7e
parent690502fee7222e8193afd2b315da313d363b1fd4
parent38488f9221034f8567e38e0d188d20abd39458cf
Merge branch 'master' into harmattan