Merge ktlim@zizzer:/bk/newmem
authorKevin Lim <ktlim@umich.edu>
Mon, 16 Apr 2007 02:40:18 +0000 (22:40 -0400)
committerKevin Lim <ktlim@umich.edu>
Mon, 16 Apr 2007 02:40:18 +0000 (22:40 -0400)
into  zamp.eecs.umich.edu:/z/ktlim2/clean/tmp/head

--HG--
extra : convert_revision : fd9a2d0e833dd47f55aad9c50c68431bc6d3e0a7


Trivial merge