[cinnamon-control-center/f20] (8 commits) ...Merge branch 'master' into f20

[leigh123linux]

Summary of changes:

  339fafa... update to latest git (*)
  019b08d... fix build (*)
  a85ef9e... patch cleanup (*)
  facd217... fix scriptlet (*)
  c4dad25... readd ldconfig (*)
  822be1e... update to 2.4.0 (*)
  399f644... add missing br for network (*)
  d14f1b5... Merge branch 'master' into f20

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