Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Mon, 23 May 2011 08:05:35 +0000 (11:05 +0300)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Mon, 23 May 2011 08:05:35 +0000 (11:05 +0300)
commit86559f0df1b29a296fc4f0de2551c768c78c7b83
tree9bbbcf317a7c688b494b9a6669f045393e844809
parentd7a2eff5a12a3be59b2da7421069f1187b1a7d7a
parent293b923f16b064cd986efedee1e27fae4802ce0d
Merge branch 'master' into harmattan

Conflicts:

configure.ac
configure.ac