Merge ktlim@zizzer:/bk/newmem
authorKevin Lim <ktlim@umich.edu>
Fri, 21 Jul 2006 20:08:17 +0000 (16:08 -0400)
committerKevin Lim <ktlim@umich.edu>
Fri, 21 Jul 2006 20:08:17 +0000 (16:08 -0400)
commitdb5f710a7b9fbaf6cc63861d9cd7dc3f4a3fdea1
treec7e7a3710d9571a6bfe42c9fee4c40c6232117e2
parent8bbe925192d786a07bb5f4fac90e11f4983f92b7
parenta6c2e5cca0d6dde79d2d011d5d0c6e4b5208b8d5
Merge ktlim@zizzer:/bk/newmem
into  zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge

configs/test/fs.py:
    Hand merge.

--HG--
extra : convert_revision : 78f7c46084f66d52ddfe0386fd7c08de8017331e
configs/test/fs.py