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

[Dan Mashal]

commit 576ed90d03fd11f0d0eb6fb08c9210b0496472ce
Merge: deffca3 9f05d3f
Author: Dan Mashal <dan.mashal at gmail.com>
Date:   Thu Aug 2 13:54:35 2012 -0700

    Merge branch 'master' into f16

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