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

author Frank Reininghaus <frank78ac@googlemail.com>

Tue, 30 Oct 2012 06:26:30 +0000 (07:26 +0100)

committer Frank Reininghaus <frank78ac@googlemail.com>

Tue, 30 Oct 2012 06:26:30 +0000 (07:26 +0100)
author Frank Reininghaus <frank78ac@googlemail.com>
Tue, 30 Oct 2012 06:26:30 +0000 (07:26 +0100)
committer Frank Reininghaus <frank78ac@googlemail.com>
Tue, 30 Oct 2012 06:26:30 +0000 (07:26 +0100)
diff --cc src/kitemviews/kfileitemmodelrolesupdater.cpp
Simple merge
author	Frank Reininghaus <frank78ac@googlemail.com>
	Tue, 30 Oct 2012 06:26:30 +0000 (07:26 +0100)
committer	Frank Reininghaus <frank78ac@googlemail.com>
	Tue, 30 Oct 2012 06:26:30 +0000 (07:26 +0100)