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

[Wolfgang Ulbrich]

commit 74a0826686254abd4fd957a21005f2fec237f148
Merge: f174d8a e978136
Author: raveit <chat-to-me at raveit.de>
Date:   Mon Jul 1 14:00:15 2013 +0200

    Merge branch 'master' into f17

 mate-control-center.spec |   30 +++++++++++++++++-------------
 1 files changed, 17 insertions(+), 13 deletions(-)
---