Merge branch 'ac2' of gimli2:/srv/cadc/git/wopencadc into ac2

projects/cadcAccessControl-Admin/.gitignore

projects/cadcAccessControl-Admin/build.xml

projects/cadcAccessControl-Admin/scripts/userAdmin

...ntrol-Admin/src/ca/nrc/cadc/ac/admin/AbstractCommand.java

...AccessControl-Admin/src/ca/nrc/cadc/ac/admin/Approve.java

...Control-Admin/src/ca/nrc/cadc/ac/admin/CmdLineParser.java

...adcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/List.java

...adcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/Main.java

...cAccessControl-Admin/src/ca/nrc/cadc/ac/admin/Reject.java

...ontrol-Admin/src/ca/nrc/cadc/ac/admin/UsageException.java

projects/cadcAccessControl-Admin/src/userAdmin.mf