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

[Mamoru Tasaka]

commit 52b8f2bd6eae3c4f5f6cf034ad4525a3c9efd636
Merge: ca2e514 be103f7
Author: TASAKA Mamoru <mtasaka at localhost.localdomain>
Date:   Wed Oct 24 09:49:20 2012 +0900

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

 xscreensaver.spec |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)
---