[mate-menus/f18: 5/5] Merge branch 'master' into f18

[Wolfgang Ulbrich]

commit 57ba099376f5cfb6f3c9f8dab2a751b94875b718
Merge: 6b78c39 3b98967
Author: raveit <chat-to-me at raveit.de>
Date:   Tue Jun 4 18:52:30 2013 +0200

    Merge branch 'master' into f18

 mate-menus.spec                   |   21 +++++++++-
 mate-menus_preferences-menu.patch |   11 +++++
 mate-preferences-categories.menu  |   77 +++++++++++++++++++++++++++++++++++++
 3 files changed, 106 insertions(+), 3 deletions(-)
---