[mate-menus/f18] (2 commits) ...Merge branches 'f18' and 'master' into f18

[Dan Mashal]

Summary of changes:

  b0e5607... initial commit (*)
  b554c97... Merge branches 'f18' and 'master' into f18

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