Merge ktlim@zizzer:/bk/newmem
authorKevin Lim <ktlim@umich.edu>
Thu, 6 Jul 2006 20:51:50 +0000 (16:51 -0400)
committerKevin Lim <ktlim@umich.edu>
Thu, 6 Jul 2006 20:51:50 +0000 (16:51 -0400)
into  zamp.eecs.umich.edu:/z/ktlim2/clean/newmem

--HG--
extra : convert_revision : 7c7fc8a2f9579d443786e86dbcf906b355de69fc


Trivial merge