Merge ktlim@zizzer:/bk/newmem
authorKevin Lim <ktlim@umich.edu>
Tue, 11 Jul 2006 17:43:30 +0000 (13:43 -0400)
committerKevin Lim <ktlim@umich.edu>
Tue, 11 Jul 2006 17:43:30 +0000 (13:43 -0400)
into  zamp.eecs.umich.edu:/z/ktlim2/clean/newmem

--HG--
extra : convert_revision : c565fd7cebaa4058ba510b3db50a9c76bf301228


Trivial merge