Merge zizzer:/bk/newmem
authorLisa Hsu <hsul@eecs.umich.edu>
Fri, 6 Oct 2006 04:39:49 +0000 (00:39 -0400)
committerLisa Hsu <hsul@eecs.umich.edu>
Fri, 6 Oct 2006 04:39:49 +0000 (00:39 -0400)
into  zizzer.eecs.umich.edu:/z/hsul/newmem

--HG--
extra : convert_revision : ecf61b323a93c9192450388c8812c26b919d06cb


Trivial merge