Merge ktlim@zizzer:/bk/newmem
authorKevin Lim <ktlim@umich.edu>
Thu, 26 Oct 2006 18:37:19 +0000 (14:37 -0400)
committerKevin Lim <ktlim@umich.edu>
Thu, 26 Oct 2006 18:37:19 +0000 (14:37 -0400)
into  zamp.eecs.umich.edu:/z/ktlim2/clean/o3-merge/newmem

--HG--
extra : convert_revision : 30a912cf5d3f205a6301d291dd1799da21663056


Trivial merge