Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Tue, 5 Jul 2011 09:55:48 +0000 (12:55 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Tue, 5 Jul 2011 09:55:48 +0000 (12:55 +0300)
commit07fe191ae663efa6fc911dc79e7ed65bdf22d178
treed301889998083e067e56da46b88ac9602fa771a2
parent59e3e33fc4c6b3491beca9f2af7dc3e608f96071
parent7e6a854e602b145a8c98fb366ba4f1f6b89e9543
Merge branch 'master' into harmattan