Merge remote-tracking branch 'origin/master' into staging

Conflicts:
	pkgs/development/libraries/boost/generic.nix

pkgs/servers/http/apache-httpd/2.2.nix

@@ -40,6 +40,10 @@ stdenv.mkDerivation rec {
     ${if sslSupport then "--enable-ssl --with-ssl=${openssl}" else ""}
     ${if ldapSupport then "--enable-ldap --enable-authnz-ldap" else ""}
     --with-mpm=${mpm}
+    --enable-cache
+    --enable-disk-cache
+    --enable-file-cache
+    --enable-mem-cache
   '';
 
   enableParallelBuilding = true;

pkgs/servers/http/winstone/default.nix

@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "http://winstone.sourceforge.net/";
-    description = "A simple Java Servlet container.";
+    homepage = http://winstone.sourceforge.net/;
+    description = "A simple Java Servlet container";
     license = stdenv.lib.licenses.cddl;
     platforms = stdenv.lib.platforms.all;
     maintainers = [ stdenv.lib.maintainers.rickynils ];