Merge zizzer:/bk/newmem
authorAli Saidi <saidi@eecs.umich.edu>
Thu, 13 Jul 2006 19:50:09 +0000 (15:50 -0400)
committerAli Saidi <saidi@eecs.umich.edu>
Thu, 13 Jul 2006 19:50:09 +0000 (15:50 -0400)
commitefc06d0545912f4589e86fe32deac98805786ee6
tree7655d0f658e0582d9985551d193811d8525d1fbc
parent1e4acb8e017ce81694c514af21ad817e9b1a078e
parente1b8e71500b7b66b115345eeaef7216617487456
Merge zizzer:/bk/newmem
into  zeep.pool:/z/saidi/work/m5.newmem

src/python/m5/main.py:
    merge two help fixes

--HG--
extra : convert_revision : b5c4a88bb84b726bebd3e357a4ef29acc0d95600