[kdelibs/f14] (3 commits) ...Merge remote-tracking branch 'origin/f15' into f14