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

[Wolfgang Ulbrich]

commit d15d3fb7b5532d521ffe998406f16e12ea20ef31
Merge: 75c976b e978136
Author: raveit <chat-to-me at raveit.de>
Date:   Sat Jun 29 23:54:43 2013 +0200

    Merge branch 'master' into f18

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