Merge branch 'riku-devel' into maemo-test