Merge ktlim@zizzer:/bk/newmem
authorKevin Lim <ktlim@umich.edu>
Sun, 23 Jul 2006 04:10:52 +0000 (00:10 -0400)
committerKevin Lim <ktlim@umich.edu>
Sun, 23 Jul 2006 04:10:52 +0000 (00:10 -0400)
into  zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge

--HG--
extra : convert_revision : 45650c90385b4e13e79ccf271a30bb55552b380f


Trivial merge