Merge ktlim@zizzer:/bk/newmem
authorKevin Lim <ktlim@umich.edu>
Fri, 27 Apr 2007 20:36:38 +0000 (16:36 -0400)
committerKevin Lim <ktlim@umich.edu>
Fri, 27 Apr 2007 20:36:38 +0000 (16:36 -0400)
into  zamp.eecs.umich.edu:/z/ktlim2/clean/tmp/head

--HG--
extra : convert_revision : 63ff3b6efce43f413b1c5560d547513437176d31


Trivial merge