These files are in both the old and new format.

Should work on both 1.0.x and CVS-HEAD

yeager
