Branch b1_6

Add files missed in last commit.  AFAIK I did things right but CVS shows
them as "Status: Entry Invalid" and won't let me add them except in a
fresh checkout.

b=12068
i=brian
i=mjmac