Merge remote-tracking branch 'origin/master' into origin-frameworks

Conflicts:
	.reviewboardrc [already here]
	kdecore/io/kzip.cpp [git couldn't follow the move!]
	kioslave/http/tests/CMakeLists.txt [same]
	tier1/itemviews/src/kwidgetitemdelegate.cpp [grmbl, revert = conflicts]
	tier1/itemviews/src/kwidgetitemdelegate.h [grmbl, revert]
	tier1/itemviews/src/kwidgetitemdelegatepool.cpp [grmbl, revert]
	tier1/kconfig/src/core/kconfig.cpp [Q_OS_WIN]
	tier1/kconfig/src/core/kdesktopfile.cpp [Q_OS_WIN]
	tier1/kconfig/src/gui/kstandardshortcut.cpp [Q_OS_WIN]
	tier1/kjs/src/wtf/Platform.h [same change already here]
	tier3/kconfigwidgets/src/krecentfilesaction.cpp [Q_OS_WIN]
	tier3/kio/src/core/kmountpoint.cpp [Q_OS_WIN]
	tier3/kservice/src/kbuildsycoca/vfolder_menu.cpp [Q_OS_WIN]
	tier4/kde4support/src/kdecore/kdeversion.h [syntax change vs kde4support]
	tier4/kde4support/src/kdecore/kstandarddirs.cpp [Q_OS_WIN]
	tier4/khtml/src/khtml_part.cpp [qDebug/kDebug]