[git/f19] (5 commits) ...Merge branch 'master' into f19

[Jon Ciesla]

Summary of changes:

  d7389e7... use systemd instead of xinetd (bz 737183) (*)
  7d37533... conditionalize systemd vs xinetd, cleanup systemd handling  (*)
  7f3286e... conditionalize systemd vs xinetd, cleanup systemd handling  (*)
  7a9ebd4... Fix desktop tag handling. (*)
  265c549... Merge branch 'master' into f19

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