Merge ktlim@zizzer:/bk/newmem
authorKevin Lim <ktlim@umich.edu>
Wed, 4 Apr 2007 19:39:13 +0000 (15:39 -0400)
committerKevin Lim <ktlim@umich.edu>
Wed, 4 Apr 2007 19:39:13 +0000 (15:39 -0400)
into  zamp.eecs.umich.edu:/z/ktlim2/clean/tmp/head

--HG--
extra : convert_revision : 7181d8c2ee673322372484cf288a94ebd91b5265


Trivial merge