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

[Rex Dieter]

Summary of changes:

  174af90... bump release version (*)
  344bd24... Merge branch 'master' into f16 (*)
  6f24f1c... Merge branch 'master' into f16 (*)
  f2d5a37... Merge branch 'master' into f16 (*)
  6d3752c... Add obsoletes tag (*)
  34b430c... fix conflicts (*)
  93df050... Merge branch 'f17' into f16 (*)

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