Merge remote-tracking branch 'origin/KDE/4.9'

author Christoph Feck <christoph@maxiom.de>

Thu, 25 Oct 2012 23:58:50 +0000 (01:58 +0200)

committer Christoph Feck <christoph@maxiom.de>

Thu, 25 Oct 2012 23:58:50 +0000 (01:58 +0200)
author Christoph Feck <christoph@maxiom.de>
Thu, 25 Oct 2012 23:58:50 +0000 (01:58 +0200)
committer Christoph Feck <christoph@maxiom.de>
Thu, 25 Oct 2012 23:58:50 +0000 (01:58 +0200)
diff --cc src/kitemviews/kstandarditemlistwidget.cpp
Simple merge
author	Christoph Feck <christoph@maxiom.de>
	Thu, 25 Oct 2012 23:58:50 +0000 (01:58 +0200)
committer	Christoph Feck <christoph@maxiom.de>
	Thu, 25 Oct 2012 23:58:50 +0000 (01:58 +0200)