[mate-conf/f16: 10/10] Merge branch 'master' into f16

[Dan Mashal]

commit 914c4501576d3f407380ef807eced8b98584fa44
Merge: a337458 8337a97
Author: Dan Mashal <dan.mashal at gmail.com>
Date:   Sun Aug 26 20:29:30 2012 -0700

    Merge branch 'master' into f16
    
    Conflicts:
    	mate-conf.spec

 mate-conf.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---