Merge ktlim@zizzer:/bk/newmem
authorKevin Lim <ktlim@umich.edu>
Fri, 10 Nov 2006 17:14:38 +0000 (12:14 -0500)
committerKevin Lim <ktlim@umich.edu>
Fri, 10 Nov 2006 17:14:38 +0000 (12:14 -0500)
into  zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-busfix

--HG--
extra : convert_revision : 56cb7fe3be5b63bd89b48ac6cb88b47d13b4c137


Trivial merge