Merge branch 'deploy' into deploy.spirit

* deploy:
  Makefile: Include C++ headers in the cross-tools bundle.

diff --git a/etc/apt-conf.d/90local b/etc/apt-conf.d/90local
index d69c64ca6dfc98fefbaed6d9901aa32d3375edca..d3febb3824e71ba3f289b12729c86b2389742efd 100644 (file)
--- a/etc/apt-conf.d/90local
+++ b/etc/apt-conf.d/90local
@@ -1,5 +1,5 @@
 ### -*-conf-*-
 
 Acquire {
-       http::Proxy "http://universe.distorted.org.uk:3142/";
+       http::Proxy "http://localhost:3142/";
 }