Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Tue, 5 Apr 2011 11:08:23 +0000 (14:08 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Tue, 5 Apr 2011 11:08:23 +0000 (14:08 +0300)
commitfe0120791475121ae7256df1c259cbdbf08f40e9
tree3e900035442f55e470de091e76f258c8ba3c926e
parentb5acc2397b3c5794b1a0f1b2d4f332c838b9b262
parent99f45f251e479cfdbb4f32838048af37fc1a1bee
Merge branch 'master' into harmattan