[mate-menus/f17: 8/8] Merge branch 'master' into f17

[Dan Mashal]

commit 349a20bc4c37142646e4238419b6080fa8df83db
Merge: e0154bf 3b1bac0
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Tue Jun 11 04:46:46 2013 -0700

    Merge branch 'master' into f17

 .gitignore                        |    1 +
 mate-menus.spec                   |   57 +++++++++++++++++++++------
 mate-menus_preferences-menu.patch |   11 +++++
 mate-preferences-categories.menu  |   77 +++++++++++++++++++++++++++++++++++++
 sources                           |    2 +-
 5 files changed, 135 insertions(+), 13 deletions(-)
---