CVS commit by kloecker: Merge from HEAD: all M +6 -2 KNode.desktop 1.165.2.1 M +2 -0 knarticlewidget.cpp 1.162.6.1 M +3 -3 kncomposer.cpp 1.185.2.1 M +1 -1 knconfigmanager.cpp 1.26.6.1 M +3 -1 knconfigwidgets.cpp 1.96.6.1 M +1 -1 knmainwidget.cpp 1.16.2.4 M +4 -4 knnntpclient.cpp 1.54.8.1