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

[Rex Dieter]

commit 93df050679e5ac97dcc25708e5a07ceb31105f99
Merge: 34b430c d940f6f
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Jan 17 16:51:27 2013 -0600

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

 mate-control-center.spec |   34 +++++++++++++++++++---------------
 1 files changed, 19 insertions(+), 15 deletions(-)
---