Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Mon, 5 Sep 2011 07:44:24 +0000 (10:44 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Mon, 5 Sep 2011 07:44:24 +0000 (10:44 +0300)
commit5b9cc9347ba7c673e250a979cbf77c5388279786
tree052973a30828a67c8e988b31baa0a24e79e47194
parent7c505ee0b511f2abc9ae1bc9f44d240c8fcfb9b2
parent708be81a2a48626b09512e7059de9138277d6dd3
Merge branch 'master' into harmattan