Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Mon, 8 Mar 2010 13:32:56 +0000 (15:32 +0200)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Mon, 8 Mar 2010 13:32:56 +0000 (15:32 +0200)
commit25e74c3e669aa325b06e162279bfe2d64973133c
tree021deb54817204de7aae1176f9f198562d7ed8be
parentaf489ce58c144ea497c4dedebd3058fadd27db55
parent0e2cbc1beb9f2cb804a8c69c3edd56107dccd2b6
Merge branch 'master' into harmattan

Conflicts:

.gitignore
.gitignore