Merge vm1.(none):/home/stever/bk/newmem-head