Merge branch 'api' of https://vcs.maemo.org/git/livewp into api1