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

diff --cc src/ui/friendlistpanel.cpp
Simple merge

diff --cc src/ui/mainwindow.h
Simple merge

diff --cc src/ui/tabbedpanel.h
Simple merge

diff --cc src/ui/userinfo.cpp
Simple merge