Merge ktlim@zizzer:/bk/newmem
authorKevin Lim <ktlim@umich.edu>
Sat, 7 Oct 2006 17:41:49 +0000 (13:41 -0400)
committerKevin Lim <ktlim@umich.edu>
Sat, 7 Oct 2006 17:41:49 +0000 (13:41 -0400)
into  zizzer.eecs.umich.edu:/.automount/zamp/z/ktlim2/clean/o3-merge/newmem

--HG--
extra : convert_revision : b013b35f5c2264712eb51bef5623b208eb6128f9


Trivial merge