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

--HG--
extra : convert_revision : 4a8cbb65b19636c31b5c6fd5f24c90f8f2148ed1


Trivial merge