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

--HG--
extra : convert_revision : a11200523e2cf7f69547b1a4f5622396caa511be


Trivial merge