[mate-common/f17: 2/2] Merge branch 'master' into f17

[Dan Mashal]

commit f9337e552aef44f990d245669d8bfd183dfba75a
Merge: 9d3ff90 9f05d3f
Author: Dan Mashal <dan.mashal at gmail.com>
Date:   Thu Aug 2 13:50:14 2012 -0700

    Merge branch 'master' into f17

 mate-common.spec |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---