Merge from changes to Memtype and Bustype and Automerge
authorRon Dreslinski <rdreslin@umich.edu>
Wed, 12 Jan 2005 20:22:58 +0000 (15:22 -0500)
committerRon Dreslinski <rdreslin@umich.edu>
Wed, 12 Jan 2005 20:22:58 +0000 (15:22 -0500)
--HG--
extra : convert_revision : 143fdcc333084c7ba04291e0c299f99566b73cc3


Trivial merge