Merge branch 'master' into harmattan harmattan/0.2-5
authorTomi Suviola <tomi.suviola@nokia.com>
Thu, 6 May 2010 11:24:39 +0000 (14:24 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Thu, 6 May 2010 11:24:39 +0000 (14:24 +0300)
commit2db1dc24b7c99b4a7f5fb32c67a5ae112a474600
tree7e88e28c5f17a9e31c1cfa8ad7ac8a0b485e2529
parentf83cdde69f1a01647d61137e6454a6ef6c1e5a6e
parentea9d41053508e1e7b68d4021f1e291c51abb7f27
Merge branch 'master' into harmattan