Merge ktlim@zizzer:/bk/newmem
authorKevin Lim <ktlim@umich.edu>
Tue, 10 Oct 2006 15:04:21 +0000 (11:04 -0400)
committerKevin Lim <ktlim@umich.edu>
Tue, 10 Oct 2006 15:04:21 +0000 (11:04 -0400)
into  zamp.eecs.umich.edu:/z/ktlim2/clean/o3-merge/newmem

--HG--
extra : convert_revision : 8b27fc92f8aafe691d70dc654bff3798abf8e755


Trivial merge