jetty-deployer branch is merged back into trunk

[David Jencks]

This was a fairly large svn operation, so I'm a little worried about 
whether I broke anything, despite testing ok on my machine.  Please 
report problems.

thanks
david jencks