[mate-control-center/f16] (5 commits) ...Merge branch 'f17' into f16

[Rex Dieter]

Summary of changes:

  0639856... update spec for obsolete tag (*)
  5699b33... fix conflicts (*)
  05e53e4... fix conflicts (*)
  d940f6f... fix obsoletes (*)
  93df050... Merge branch 'f17' into f16

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