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

--HG--
extra : convert_revision : 05f738ab6cf1e8bd2940f4ce20602f1e8ad1af48


Trivial merge