[xscreensaver/f17: 2/2] Merge remote-tracking branch 'origin/master' into f17

[Mamoru Tasaka]

commit 39d5d121b3e55c1071d4887a32b4f12cecb139b0
Merge: 52b8f2b 0652a2f
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Tue Oct 30 23:41:04 2012 +0900

    Merge remote-tracking branch 'origin/master' into f17

 ...aver-5.20-distort-configurenotify-startup.patch |   12 ++++++++++++
 xscreensaver.spec                                  |   10 +++++++++-
 2 files changed, 21 insertions(+), 1 deletions(-)
---