Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Sat, 9 Oct 2010 19:59:15 +0000 (22:59 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Sat, 9 Oct 2010 19:59:15 +0000 (22:59 +0300)
commit1d3977087d7f1336e022be7b8a8eb35c9f9b1ba2
treed21294670d638d43b49b327a0b02ec22db6ef307
parent9e01191a9f3e006b090781e3f5c734f824546f30
parent2cdc38c16f11c9b23cc6564cd7364cd96ffccd7f
Merge branch 'master' into harmattan