[mate-desktop/f17] (18 commits) ...Merge branch 'master' into f18

[Dan Mashal]

Summary of changes:

  dbdfbca... fix errors in spec file (*)
  b6fb9f3... Add po_package line (*)
  5a74e46... fix merge error (*)
  9b56503... Merge branch 'master' into f18 (*)
  ca40769... Merge branch 'master' into f18 (*)
  8724f04... fix Dan's typo :-( (*)
  438bd5d... Merge branch 'master' into f18 (*)
  a8a4db8... Merge branch 'master' into f18 (*)
  c5ebb3e... Merge branch 'master' into f18 (*)
  9461cb5... Merge branch 'master' into f18 (*)
  1ae292b... update spec (*)
  c29f048... Merge branch 'f18' of ssh://pkgs.fedoraproject.org/mate-des (*)
  ec032a8... Merge branch 'master' into f18 (*)
  0c917a1... Merge branch 'master' into f18 (*)
  078cb67... Merge branch 'master' into f18 (*)
  c091c38... Merge branch 'master' into f18 (*)
  7efc84d... Merge branch 'master' into f18 (*)
  f4ded18... Merge branch 'master' into f18 (*)

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