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

[Dan Mashal]

commit 4d118195b09517c73840b7c44f8ab925fa99d022
Merge: 4509f20 526a2bf
Author: Dan Mashal <dan.mashal at gmail.com>
Date:   Mon Nov 26 01:26:19 2012 -0800

    Merge branch 'master' into f16

 mate-screensaver.spec |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---