Merge
authorAli Saidi <saidi@eecs.umich.edu>
Mon, 16 Feb 2004 05:00:23 +0000 (00:00 -0500)
committerAli Saidi <saidi@eecs.umich.edu>
Mon, 16 Feb 2004 05:00:23 +0000 (00:00 -0500)
dev/tsunami_cchip.cc:
    SCCS merged

--HG--
extra : convert_revision : a4b2b0b92038217608a733a6c8f27edb018e910d


Trivial merge