> shouldn't we still use mergemaster? It was my understanding that 'make upgrade' handles it; mergemaster is no longer mentioned in /usr/src/UPDATING.
