Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem
authorSteve Reinhardt <stever@eecs.umich.edu>
Tue, 24 Oct 2006 15:50:20 +0000 (11:50 -0400)
committerSteve Reinhardt <stever@eecs.umich.edu>
Tue, 24 Oct 2006 15:50:20 +0000 (11:50 -0400)
into  zizzer.eecs.umich.edu:/z/stever/bk/newmem-head

--HG--
extra : convert_revision : a077304e608753f50f4a12216901d156469eebe4


Trivial merge