l-s-s-security-privacy merge-back-in: Three spots where old MeeGo.QOfono was...
l-s-s-security-privacy merge-back-in: Three spots where old MeeGo.QOfono was still used. Amend to QOfono namespace.
l-s-s-security-privacy merge-back-in: Three spots where old MeeGo.QOfono was still used. Amend to QOfono namespace.