uncommitted changes from xvm.mit.edu:/etc/apache2