Intermediate branch for merging threaded2 to trunk
Fix whitespace etc in makefiles
Really put svn:keyword Id...
Add svn 'Id'.
Copied revision 1006 from shibi to nceas. Old version control will now be only read only. This will be the primary version control.