Merge ktlim@zizzer:/bk/newmem
authorKevin Lim <ktlim@umich.edu>
Wed, 29 Nov 2006 21:08:19 +0000 (16:08 -0500)
committerKevin Lim <ktlim@umich.edu>
Wed, 29 Nov 2006 21:08:19 +0000 (16:08 -0500)
into  zamp.eecs.umich.edu:/z/ktlim2/clean/tmp/test-regress

--HG--
extra : convert_revision : 3142f68356458ecd2677c30e9cf0a65005b782c2


Trivial merge