Merge branch 'mmv' of git://oss.sgi.com/makc/morts into nathans
Resolved merge conflict on src/include/GNUmakefile.
Merge branch 'mmv' of git://oss.sgi.com/makc/morts into nathans
Resolved merge conflict on src/include/GNUmakefile.