Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Fri, 27 May 2011 11:47:32 +0000 (14:47 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Fri, 27 May 2011 11:47:32 +0000 (14:47 +0300)
commita63c3f8a7a6be3b15d7263c1ce895b5ec3d7f296
tree80f9630cf8b714c75aa3364b82fe5519777387ad
parent076c320df002f1801a44b5a4335b8ecf8e8fab4e
parent825eb4bf527c12e46c56c10cf358b3e7a60e0472
Merge branch 'master' into harmattan