[mate-screensaver/f17: 3/3] Merge branch 'master' into f17

[Dan Mashal]

commit 889b63acbae41cf76555b79da56cb2ee79887b1b
Merge: 79d926d b82ed6e
Author: Dan Mashal <dan.mashal at gmail.com>
Date:   Thu Nov 22 21:42:15 2012 -0800

    Merge branch 'master' into f17
    
    Conflicts:
    	mate-screensaver.spec

 mate-screensaver.spec  |   48 ++--
 upstream_commits.patch |  795 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 823 insertions(+), 20 deletions(-)
---