Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Mon, 10 May 2010 06:55:51 +0000 (09:55 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Mon, 10 May 2010 06:55:51 +0000 (09:55 +0300)
commita513aaeb1d98f3e8f6ac925c73f7e7a822483904
tree53925e8390c75384d9925248bc42a435fa457149
parentde3eaeeab5fb68d461d9fd719abef2b6594c09fa
parentaf812a08cac9dc7b0404f7519f27d17ce4da6637
Merge branch 'master' into harmattan