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

[Mamoru Tasaka]

commit cb8c11a8ddbcac733f7cd7518228627ca9bedf32
Merge: aea3b20 be103f7
Author: TASAKA Mamoru <mtasaka at localhost.localdomain>
Date:   Wed Oct 24 09:48:45 2012 +0900

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

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