Merge remote branch 'maemo/master'