-N,-M implies -a


git-svn-id: file:///afs/nd.edu/user37/ccl/svn/cctools/trunk@2696 a4d8336d-3463-0410-8bba-c098c45d37a8
Merge remote-tracking branch 'refs/remotes/ccl/remotes/svn/trunk'
Merge branch 'resource-profiles' of github.com:btovar/cctools into resource-profiles