[mate-control-center/f17: 5/5] Merge branch 'master' into f17

[Dan Mashal]

commit 57e46d885479a35374511e1c4f434f94b4648686
Merge: 311b725 e17777a
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Mon Mar 25 15:54:22 2013 -0700

    Merge branch 'master' into f17
    
    Conflicts:
    	mate-control-center.spec

 mate-control-center.spec |   67 +++++++++++++++-------------------------------
 1 files changed, 22 insertions(+), 45 deletions(-)
---