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

[Wolfgang Ulbrich]

commit 64f96b6b6bee53f5072832b3e7ab6bc68b543f68
Merge: 9ce4729 e978136
Author: raveit <chat-to-me at raveit.de>
Date:   Sat Jun 29 23:39:22 2013 +0200

    Merge branch 'master' into f19

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