[Nexus-developers] CVS update: nexus

[nexus at otak.nd.rl.ac.uk]

Update of /isis/cvs/repository/nexus
In directory otak.nd.rl.ac.uk:/tmp/cvs-serv17073

Modified Files:
	configure.ac 
Log Message:
Resolving conflict in file to deal with adding java support.