Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Thu, 30 Dec 2010 08:26:23 +0000 (10:26 +0200)
committerTomi Suviola <tomi.suviola@nokia.com>
Thu, 30 Dec 2010 08:26:23 +0000 (10:26 +0200)
commit6c1ea0026919f020389a36f4eae84406b07c4cd6
tree608d2280fe0f9030bcd9d65e004f0e6485708a15
parent0a061c814fa4d404ea9e6efa3bfdb991e7eaece2
parentbce899e37335792a407071796653106eb6877f13
Merge branch 'master' into harmattan