Merge ktlim@zizzer:/bk/newmem
authorKevin Lim <ktlim@umich.edu>
Mon, 5 Jun 2006 17:39:53 +0000 (13:39 -0400)
committerKevin Lim <ktlim@umich.edu>
Mon, 5 Jun 2006 17:39:53 +0000 (13:39 -0400)
into  zizzer.eecs.umich.edu:/.automount/zamp/z/ktlim2/clean/newmem-merge

--HG--
extra : convert_revision : ae48a0cafa75459c0dbd71eab93934bbdc8614ae


Trivial merge