Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Tue, 11 May 2010 12:57:56 +0000 (15:57 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Tue, 11 May 2010 12:57:56 +0000 (15:57 +0300)
commitd024c90a8cf9e2064822791a9e456ac246b1fb76
treed84687b1c6739b9f552413f663d95bd2e2f292cd
parentc6c22406569dc9badeaef21f6f3bbc9994b556b0
parent4818f97fb8ee7c767364f15366d622367a5a26e2
Merge branch 'master' into harmattan