Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Wed, 16 Mar 2011 13:08:49 +0000 (15:08 +0200)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Wed, 16 Mar 2011 13:08:49 +0000 (15:08 +0200)
commit66f472d0d973a6a9961155c6eb71c9abe3248e51
treeae4f667c97ac1df9a601335007ecce76db14aedb
parentf1a28d7119f46217421ae71e8a331e9232164e8d
parent9e0da022a936b37af2361f0da48485444ca86e9e
Merge branch 'master' into harmattan