[cmake-fedora/f21] (15 commits) ...Merge branch 'el5'

[Ding-Yi Chen]

Summary of changes:

  52ff72a... Merge branch 'master' into f20 (*)
  6f56b81... Merge branch 'master' into f19 (*)
  cc6e1f9... Merge branch 'master' into epel7 (*)
  a95ae2f... Merge branch 'master' into el6 (*)
  ac8d181... Merge branch 'master' into el5 (*)
  e3ae718... Merge branch 'master' into f20 (*)
  afb395b... Merge branch 'master' into f19 (*)
  a473fab... Merge branch 'master' into epel7 (*)
  b772dfd... Merge branch 'master' into el6 (*)
  2fcb682... Merge branch 'master' into el5 (*)
  17c4107... Merge branch 'f20' (*)
  ffa97ec... Merge branch 'f19' (*)
  1ef505f... Merge branch 'epel7' (*)
  30a3988... Merge branch 'el6' (*)
  250ff9b... Merge branch 'el5' (*)

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