Merge commit 'refs/merge-requests/1' of gitorious.org:meego-cellular/ofono-qt into...