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

[Dan Mashal]

commit fc1e1bc58a5bb0be9d265793359503a993a042e6
Merge: 9f4bf7c 6ae10bd
Author: Dan Mashal <dan.mashal at gmail.com>
Date:   Sun Nov 25 18:28:57 2012 -0800

    Merge branch 'master' into f16

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