Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Fri, 14 May 2010 08:35:07 +0000 (11:35 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Fri, 14 May 2010 08:35:07 +0000 (11:35 +0300)
commit8901406a4c870eb27737f49d433109d166f67810
treee96d64bfa08870d37ec3c4ac14ed9714adba8def
parentfac05b22247083881f3c894e9a4ac5013c3e7ca9
parent2cc91c21683b07d32bad93f6a603060af3c7ea43
Merge branch 'master' into harmattan