Compatibility with harmattan
Merge pull request #354 from xsacha/master

Nokia N9/Harmattan port
Merge remote-tracking branch 'upstream/master'