Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Tue, 26 Jul 2011 10:34:36 +0000 (13:34 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Tue, 26 Jul 2011 10:34:36 +0000 (13:34 +0300)
commita44bd451dcd373cd4c06216972c444a56674549f
treeb722886fc75013912469f3f535d83a3665e6edec
parent114ed4b9184095810281878e93eac28df25752dd
parent7af5eef110d2d8ca3a277ad6ccb6eefebbf7a1e1
Merge branch 'master' into harmattan