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

[Wolfgang Ulbrich]

commit c1632e68c08367df2e68dbf76d8ad2d6ba102f22
Merge: 57ba099 3b1bac0
Author: raveit <chat-to-me at raveit.de>
Date:   Fri Jun 7 13:37:33 2013 +0200

    Merge branch 'master' into f18

 mate-menus.spec |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)
---