Merge ktlim@zizzer:/bk/newmem
authorKevin Lim <ktlim@umich.edu>
Wed, 19 Jul 2006 18:46:05 +0000 (14:46 -0400)
committerKevin Lim <ktlim@umich.edu>
Wed, 19 Jul 2006 18:46:05 +0000 (14:46 -0400)
into  zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge

--HG--
extra : convert_revision : 06cb509fbbce882793997db275ff7c54058ae619


Trivial merge