CVS Commit: FAC dist/sup/fac.amd64_u1404 by rlink

[Ray Link]

Update of /afs/cs.cmu.edu/project/fac-cvs/dist/sup/fac.amd64_u1404
In directory gin.fac.cs.cmu.edu:/afs/.cs.cmu.edu/project/fac-master/dist/sup/fac.amd64_u1404

Modified Files:
	list 
Log Message:
Manage dma.conf via confmerge