Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Fri, 18 Feb 2011 14:30:50 +0000 (16:30 +0200)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Fri, 18 Feb 2011 14:30:50 +0000 (16:30 +0200)
commit4d11c389c713bed95ed2829f403352b177a1dd01
tree08363006b79b6ba923d0c2a101940ab8310e259b
parentca52f4f3994644020efd31cd6252d86d32f5da7c
parente052561da118569b8bb434fa85538b9c7422ba1c
Merge branch 'master' into harmattan