Merge zizzer.eecs.umich.edu:/bk/newmem
authorGabe Black <gblack@eecs.umich.edu>
Fri, 22 Jun 2007 21:44:33 +0000 (17:44 -0400)
committerGabe Black <gblack@eecs.umich.edu>
Fri, 22 Jun 2007 21:44:33 +0000 (17:44 -0400)
into  zizzer.eecs.umich.edu:/.automount/wexford/x/gblack/newmem-o3-micro

--HG--
extra : convert_revision : 3fa3fa4544ff8c9d2135e1befe6c8f4757006a2a


Trivial merge