* merge from head. David's fix for "Write slice name to /etc/slicename." bump rev.