Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Wed, 29 Dec 2010 09:55:15 +0000 (11:55 +0200)
committerTomi Suviola <tomi.suviola@nokia.com>
Wed, 29 Dec 2010 09:55:15 +0000 (11:55 +0200)
commit5e5c6fc33d9b902576181a16b041724046685e31
treef54a526e847476a7947e03cb7521de279161c4f6
parent2310b5c36007bfbc694bee9fbc80bb0f49ec4e5a
parenta4b397fc394ebb84f9b224adfd32fc7bbe15d492
Merge branch 'master' into harmattan