Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Fri, 27 May 2011 11:55:45 +0000 (14:55 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Fri, 27 May 2011 11:55:45 +0000 (14:55 +0300)
commit529b7c8746efcacf12d3d829a2394a1480c407b1
treeba31d27a7955614034ef66dc2940e2ee471d5db9
parent7faccdfa88d8776423309ce57f5dd6d1e30b5dfd
parentc28707c3916935aeaf0891ef9ed4efdb176ea826
Merge branch 'master' into harmattan