Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Fri, 16 Apr 2010 10:34:12 +0000 (13:34 +0300)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Fri, 16 Apr 2010 10:34:12 +0000 (13:34 +0300)
commit88c048cb6a5eb366e0b421f4edd9259f643407bf
tree69dd9c5ff57ad338bb7920cf4e3634831b4f3c01
parenteb154b99c52098c3d277c949a1bb5369924b02d0
parent2421c26a9c57a199f94b0d9d61e62935e3aebc57
Merge branch 'master' into harmattan

Conflicts:

configure.ac