Merge ktlim@zizzer:/bk/newmem
authorKevin Lim <ktlim@umich.edu>
Fri, 9 Jun 2006 16:29:40 +0000 (12:29 -0400)
committerKevin Lim <ktlim@umich.edu>
Fri, 9 Jun 2006 16:29:40 +0000 (12:29 -0400)
into  zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge

--HG--
extra : convert_revision : 184b6ff6c11de8f9c9083dcb93754cb451d9cfce


Trivial merge