Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Fri, 1 Apr 2011 07:04:25 +0000 (10:04 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Fri, 1 Apr 2011 07:04:25 +0000 (10:04 +0300)
commitc08ef5171f9b122b1a8cff0b7bdcbff1f4b6587b
tree7129e90f499f59178f868b7138e7980c5a3f9537
parent4b8a346d60b8abd4f1130fa1a04aab7aa64ae2d5
parent5325851f212b85ba302a4d6bc4daaf4ec8bb5b43
Merge branch 'master' into harmattan