[kdepim/f17] (11 commits) ...Merge branch 'f18' into f17

[Rex Dieter]

Summary of changes:

  5129e57... 4.9.90 (*)
  6a36f37... fix %%files (*)
  f218a54... fix build (*)
  2823585... Revert "fix build" (*)
  8c22a5c... 4.9.95 (*)
  b95efe2... 4.9.97 (*)
  963da3a... 4.9.98 (*)
  360e03c... 4.10.0 (*)
  3a9d8b7... 4.10.1 (*)
  c40a1c9... Merge branch 'master' into f18 (*)
  640bfb0... Merge branch 'f18' into f17

(*) This commit already existed in another branch; no separate mail sent