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

[Dan Mashal]

commit 344bd242ef5e2039006ee2221ac3234168d5a959
Merge: 174af90 87f5c84
Author: Dan Mashal <dan.mashal at gmail.com>
Date:   Wed Dec 26 03:10:31 2012 -0800

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

 .gitignore               |    1 +
 mate-control-center.spec |   73 ++++++++++++++++++++++++++++++++-------------
 sources                  |    2 +-
 3 files changed, 54 insertions(+), 22 deletions(-)
---