[mate-screensaver/f16: 4/4] Merge branch 'master' into f16

[Dan Mashal]

commit 01ec965ff1921013bb0f7492c87c7a097eb89fc9
Merge: 4d11819 c59743d
Author: Dan Mashal <dan.mashal at gmail.com>
Date:   Wed Dec 26 03:09:28 2012 -0800

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

 ...screensaver-1.5.1-only_allow_one_instance.patch |   59 +++++++++++
 mate-screensaver.spec                              |  110 ++++++++++++-------
 2 files changed, 128 insertions(+), 41 deletions(-)
---