Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Wed, 26 Jan 2011 11:46:56 +0000 (13:46 +0200)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Wed, 26 Jan 2011 11:46:56 +0000 (13:46 +0200)
commit1601831d8307475df23a672dd717b969e23f9445
tree6c1090fe4a3fde940083f2fa357c92e657e0a768
parentcb12434972659fdda496f96bcbe3aae1faad07c5
parentc2d2b2b35b767b1b34026cdea8b66267b4a0d186
Merge branch 'master' into harmattan