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

[Mamoru Tasaka]

commit 1b558ae63e30c8ad4998dd59b4e8fa855b21c92c
Merge: cb8c11a 0652a2f
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Tue Oct 30 23:40:05 2012 +0900

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

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