Use UNIX line endings!
Strip trailing whitespace
Merge pull request #61 from jrha/sl6.x-x86_64

SL6: Fix white-space issues