Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Fri, 20 May 2011 11:10:03 +0000 (14:10 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Fri, 20 May 2011 11:10:03 +0000 (14:10 +0300)
commitff6d28df116c4a18e644765819a8a9a9dd820f81
tree8c097cc4cb564da6db6b8b2b3b8ae8857cbec643
parent90abd6b0019a64bff5986871ef8188ecfdac0654
parent71220975c2644922198c027b3462dda4d8a260d0
Merge branch 'master' into harmattan