Merge ktlim@zizzer:/bk/newmem
authorKevin Lim <ktlim@umich.edu>
Wed, 14 Jun 2006 02:40:02 +0000 (22:40 -0400)
committerKevin Lim <ktlim@umich.edu>
Wed, 14 Jun 2006 02:40:02 +0000 (22:40 -0400)
into  zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge

--HG--
extra : convert_revision : 5c0e56572c5ca14e0c9a7ac52b0453026e48b336


Trivial merge