Merge branch 'KDE/4.9'

Conflicts:
	konq-plugins/dirfilter/dirfilterplugin.cpp
	konq-plugins/dirfilter/dirfilterplugin.h

diff --cc src/kitemviews/kitemlistcontroller.cpp
Simple merge

diff --cc src/kitemviews/kstandarditemlistwidget.cpp
Simple merge

diff --cc src/panels/places/placesitemmodel.cpp
Simple merge

diff --cc src/views/dolphinview.cpp
Simple merge