[xscreensaver/f18] (5 commits) ...fix conflict

[Mamoru Tasaka]

Summary of changes:

  0c4c435... Fix segv on lament with -wireframe option (bug 849961) (*)
  fbe5d04... More fix on bug 849961 (lament -no-texture) (*)
  2a428a5... Remove warning from calling glLighti with float argument in (*)
  b3accd7... A bit spec file cleanup (*)
  6384b60... fix conflict

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