Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Wed, 3 Nov 2010 13:25:55 +0000 (15:25 +0200)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Wed, 3 Nov 2010 13:25:55 +0000 (15:25 +0200)
commit87e32913dd36d84fa3a981b90150e03284e62a36
treeb5fedd61ee0e7b248b61e7683b0ef899649779cf
parent509c353684a2b13034e6e90bf5c2e5f0b05eeb77
parent3f7bca326537f9c9351e06ecb715fcfdf95a4777
Merge branch 'master' into harmattan