Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Tue, 28 Dec 2010 08:44:40 +0000 (10:44 +0200)
committerTomi Suviola <tomi.suviola@nokia.com>
Tue, 28 Dec 2010 08:44:40 +0000 (10:44 +0200)
commit7b118c8a8b2fd9b8ea1d44c0e0f675c8fa01690b
tree74356f1237710a7a7b049b3c7c3060977167deac
parentaac8884d53948d1125bb13df7113ec1fa28c25c5
parent434bbf6196559e0c3ef31e8c962aaa699485ed86
Merge branch 'master' into harmattan