Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Thu, 14 Apr 2011 08:29:54 +0000 (11:29 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Thu, 14 Apr 2011 08:29:54 +0000 (11:29 +0300)
commit9f5fe1502d6ba1bccc2c0d80613739a9cc235329
treeb93ad3fa1ba14ed6d3196ab07358e3e0a12e5c52
parent085d862403879f309ede20108ad13c9471ace72d
parent7edeb28576d7a8ccdeadea0f5b8149bef029b398
Merge branch 'master' into harmattan