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

[leigh123linux]

commit 6b790e0395e98067ed3f3bfeba221fe8dff25aaf
Merge: 68cf9c2 b559cb7
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Fri Nov 23 21:04:41 2012 +0000

    Merge branch 'master' into f17

 .gitignore             |    1 +
 mate-screensaver.spec  |   14 +-
 sources                |    2 +-
 upstream_commits.patch |  795 ------------------------------------------------
 4 files changed, 8 insertions(+), 804 deletions(-)
---