Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Thu, 23 Jun 2011 11:17:08 +0000 (14:17 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Thu, 23 Jun 2011 11:17:08 +0000 (14:17 +0300)
commite91c84367ce73eb303e09e3e32660c8c8887e2eb
tree570d4902172cd66ed4a43d50c59019d71b7d3198
parentd5e0879df5c8b5001f70ba0a4449e8b298ed5036
parent86e2a1dd1cba7683f225ee1800368ee386d54697
Merge branch 'master' into harmattan