[xscreensaver] (8 commits) ...Merge remote-tracking branch 'origin/master' into f18

[Mamoru Tasaka]

Summary of changes:

  6d34ef1... Fix segv on lament with -wireframe option (bug 849961) (*)
  e21cd66... More fix on bug 849961 (lament -no-texture) (*)
  673dcb3... Remove warning from calling glLighti with float argument in (*)
  6384b60... fix conflict (*)
  aea3b20... Merge remote-tracking branch 'origin/master' into f18 (*)
  cb8c11a... Merge remote-tracking branch 'origin/master' into f18 (*)
  1b558ae... Merge remote-tracking branch 'origin/master' into f18 (*)
  210eabd... Merge remote-tracking branch 'origin/master' into f18 (*)

(*) This commit already existed in another branch; no separate mail sent