Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Thu, 17 Feb 2011 13:34:51 +0000 (15:34 +0200)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Thu, 17 Feb 2011 13:34:51 +0000 (15:34 +0200)
commit60211961e2124a20a43ae24ee1a80bbef41fda84
tree5c2532094eb1230172967305fe31224b28ee8ae1
parent4325fbe1cd082fc4c9a5b44b83008a69f130076f
parent09c676eb72c76394195c794e72a6c6e83d62400d
Merge branch 'master' into harmattan