Merged revisions 844680 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.1/kdepim
........
r844680 | djarvie | 2008-08-10 10:19:14 +0200 (Sun, 10 Aug 2008) | 2 lines Change Control Center references to System Settings
........
svn path=/branches/kdepim/enterprise4/kdepim/; revision=851313