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

[Dan Mashal]

commit 3377aaa62dcd5544dd38672016e447c7fc59fd29
Merge: 23f9955 4493423
Author: Dan Mashal <dan.mashal at gmail.com>
Date:   Mon Nov 26 02:35:59 2012 -0800

    Merge branch 'master' into f17

 mate-calc.spec |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---