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

[leigh123linux]

commit fdc5c3cffa63ebe02a80d91e348753385a279166
Merge: b554c97 6ae10bd
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Thu Nov 8 13:40:12 2012 +0000

    Merge branch 'master' into f18

 .gitignore      |    1 +
 mate-menus.spec |   27 +++++++++++++++++++--------
 sources         |    2 +-
 3 files changed, 21 insertions(+), 9 deletions(-)
---