[mate-applets/f18] (4 commits) ...fix merge conflicts

[Wolfgang Ulbrich]

Summary of changes:

  8384b3f... add patch for upower-1.0 (*)
  8925b49... add patch for upower-1.0 to spec file (*)
  055ca12... clean up BRs (*)
  ff89ab4... fix merge conflicts

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