should solve the "updating cvs when .l files change give me conflict markers
that break my build" issue.

llvm-svn: 26160