Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Tue, 26 Jul 2011 12:38:11 +0000 (15:38 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Tue, 26 Jul 2011 12:38:11 +0000 (15:38 +0300)
commit43aeda30078c11b58b11c00a33c8f5408b6c0909
tree52cb8eaef88a0a9f8f55097019b07384af665451
parenta1704cb6f28f9550a63be234cd6b5795281424ab
parent401c17fd03ecc5caa9fe92b0294abe3483242307
Merge branch 'master' into harmattan