Merge zizzer.eecs.umich.edu:/z/stever/bk/m5-head
authorSteve Reinhardt <stever@eecs.umich.edu>
Thu, 17 Mar 2005 04:10:22 +0000 (23:10 -0500)
committerSteve Reinhardt <stever@eecs.umich.edu>
Thu, 17 Mar 2005 04:10:22 +0000 (23:10 -0500)
into zizzer.eecs.umich.edu:/z/stever/bk/m5-py

--HG--
extra : convert_revision : 39f30bd052c0f2b88524311d674bad7a0fae6358

1  2 
python/m5/config.py

Simple merge