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

[Wolfgang Ulbrich]

commit 2dd0c4a14310c62dbb6f738a35e7fffe27e005d7
Merge: 57fe230 5258ae4
Author: raveit65 <chat-to-me at raveit.de>
Date:   Sat Oct 19 17:53:18 2013 +0200

    Merge branch 'master' into f18

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