[mate-calc/f17: 3/3] Merge branch 'master' into f17

[Dan Mashal]

commit d3273792c4c67315fbf7fca5909da03c229250af
Merge: 3377aaa a4463cb
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Mon Mar 25 13:01:00 2013 -0700

    Merge branch 'master' into f17

 .gitignore     |    1 +
 mate-calc.spec |   14 +++++++++-----
 sources        |    2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)
---