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

[Dan Mashal]

commit d0629fe01d417327c6b499d766bfe925de232ba4
Merge: 576ed90 3ebf66d
Author: Dan Mashal <dan.mashal at gmail.com>
Date:   Thu Aug 2 14:27:22 2012 -0700

    Merge branch 'master' into f16

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