Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Fri, 11 Feb 2011 13:08:56 +0000 (15:08 +0200)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Fri, 11 Feb 2011 13:08:56 +0000 (15:08 +0200)
commit03572c2ac7a8b07fb5df9e1bf25e1084a8f6dfa4
treecdcf3f4b8a694c971ab0713a37d677c7b40afc72
parent4577e8a1cffdc584ce304bae4ee461fbc3ce989e
parentcfe8d1597513c461d574e823edd65e1f3a77f7f7
Merge branch 'master' into harmattan