[yum-updatesd/f16] (8 commits) ...Fix merge conflict

[brummbq]

Summary of changes:

  952099b... convert to systemd file (*)
  d9adc29... fix broken scriptlets (*)
  79f14bf... add missing scriptlets (*)
  9ce5bd2... fix missing requires(post) (*)
  358b681... - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass (*)
  2bb65b8... -adapt to new networkmanager dbus interface (*)
  4ce8d02... -adapt to new networkmanager dbus interface
  cdfce81... Fix merge conflict

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