Merge zizzer:/bk/newmem
authorVincentius Robby <acolyte@umich.edu>
Thu, 31 May 2007 20:02:31 +0000 (16:02 -0400)
committerVincentius Robby <acolyte@umich.edu>
Thu, 31 May 2007 20:02:31 +0000 (16:02 -0400)
into  zamp.eecs.umich.edu:/.automount/greenville/w/acolyte/newmem

--HG--
extra : convert_revision : c80b7ef5a2cc4ab1b86bb1eef7fae91886a7737d


Trivial merge