Merge vm1.(none):/home/stever/bk/newmem-head
authorSteve Reinhardt <stever@eecs.umich.edu>
Sat, 21 Oct 2006 18:41:53 +0000 (11:41 -0700)
committerSteve Reinhardt <stever@eecs.umich.edu>
Sat, 21 Oct 2006 18:41:53 +0000 (11:41 -0700)
into  vm1.(none):/home/stever/bk/newmem-llsc

--HG--
extra : convert_revision : 157d07cc56e8ea68741d1b8536a9856488cb4a69


Trivial merge