Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Thu, 26 May 2011 08:19:43 +0000 (11:19 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Thu, 26 May 2011 08:19:43 +0000 (11:19 +0300)
commit076c320df002f1801a44b5a4335b8ecf8e8fab4e
treeaf222001ad5cd2246d09a1332c4a507cc567b8a5
parente86e808c18f00f086e69480344929585f3a9398b
parent237802a2af23b88760d83306bc6d9b2785824948
Merge branch 'master' into harmattan