Merge ktlim@zizzer:/bk/newmem
authorKevin Lim <ktlim@umich.edu>
Sun, 8 Oct 2006 03:35:32 +0000 (23:35 -0400)
committerKevin Lim <ktlim@umich.edu>
Sun, 8 Oct 2006 03:35:32 +0000 (23:35 -0400)
into  zamp.eecs.umich.edu:/z/ktlim2/clean/o3-merge/newmem

--HG--
extra : convert_revision : 0309a453c0d65579cfa022888d1a2ab4f0171a9f


Trivial merge