Merge branch 'master' into harmattan harmattan/0.15-1
authorTomi Suviola <tomi.suviola@nokia.com>
Fri, 17 Sep 2010 10:03:49 +0000 (13:03 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Fri, 17 Sep 2010 10:03:49 +0000 (13:03 +0300)
commit217b2370c67f4a3f053db23560de30f30f9661d3
tree55299d2534016e3bb81582028716bcabe12cf41f
parent8c5d3810c00f8de2c24c154bdf9d9bed5705cb37
parent4964f15ac49a24f6313857d133cf2caaa510d9bc
Merge branch 'master' into harmattan