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

[Wolfgang Ulbrich]

commit c6b05e5b406325e4f7401b3a9584f9a81e529426
Merge: d866015 5258ae4
Author: raveit65 <chat-to-me at raveit.de>
Date:   Sat Oct 19 17:44:11 2013 +0200

    Merge branch 'master' into f19

 mate-control-center.spec                           |   24 ++++++++++++++++++-
 ...use-gnome-keyring_instead-of-mate-keyring.patch |   23 +++++++++++++++++++
 2 files changed, 45 insertions(+), 2 deletions(-)
---