Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Thu, 16 Dec 2010 10:19:00 +0000 (12:19 +0200)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Thu, 16 Dec 2010 10:19:00 +0000 (12:19 +0200)
commit32097466746a028aba964d226031f7d356dbe071
tree8c8f882e9320c4df744bba89076e5b96f3727cd8
parent71f0feef5bc6b2526fc27844cc838dac4bb0200c
parentcac7247522fcb6bf09bbf8ee7524e92a02ae464e
Merge branch 'master' into harmattan