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

[Mamoru Tasaka]

commit 6ce8f65a123a0f257af290c9c8c434e3f2f42f6f
Merge: e193be7 0652a2f
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Tue Oct 30 23:44:04 2012 +0900

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

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