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

[Dan Mashal]

commit b1f974caf23d0e65c5a893e5c183642d5236f7e6
Merge: d0629fe 6a5d131
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Thu Oct 11 05:47:19 2012 -0400

    Merge branch 'master' into f16

 .gitignore       |    1 +
 mate-common.spec |   13 ++++++++-----
 sources          |    2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)
---