Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Fri, 30 Sep 2011 12:48:40 +0000 (15:48 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Fri, 30 Sep 2011 12:48:40 +0000 (15:48 +0300)
commit847a65a3ba35d5414d8dbe469d849765bd7a48be
tree4b45bdccd7e1a6082bbfcd16e798c5cde4c38702
parentd44ac7fa8dffb5c1ba6d924bf64a6758e4d85321
parent581028e4092bad8e105114e521916045bda28fb4
Merge branch 'master' into harmattan