Merge ktlim@zizzer:/bk/newmem
authorKevin Lim <ktlim@umich.edu>
Mon, 6 Nov 2006 18:27:57 +0000 (13:27 -0500)
committerKevin Lim <ktlim@umich.edu>
Mon, 6 Nov 2006 18:27:57 +0000 (13:27 -0500)
into  zamp.eecs.umich.edu:/z/ktlim2/clean/newmem

--HG--
extra : convert_revision : d6bb87586cf7ee63ca32e36944c3755fae0b55d0


Trivial merge