Merge branch 'new_panels' of https://vcs.maemo.org/git/situare into new_panels