[cinnamon-session/f20] (7 commits) ...update to 2.0.5

[leigh123linux]

Summary of changes:

  9b74de8... fix upower compile issue (*)
  2d6c4a9... fix upower patch (*)
  f51a6ac... fix upower patch again (*)
  b633953... fix upower patch again (*)
  f78daab... fix upower patch again (*)
  007ce66... respin upower patch (*)
  357aba1... update to 2.0.5 (*)

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