The diff looks pretty rough -- is this a line endings problem?