* extraSubservices: the subservice config no longer needs to be

in a `config' attribute.  So instead of

    extraSubservices = [
      { serviceName = "foo";
        config = {
          bla = ...;
        };
      }
    ];

  you can write

    extraSubservices = [
      { serviceName = "foo";
        bla = ...;
      }
    ];

svn path=/nixos/trunk/; revision=12024

upstart-jobs/apache-httpd/default.nix

@@ -54,7 +54,8 @@ let
         svcFunction =
           if svc ? function then svc.function
           else import (./noDir/.. + ("/" + svc.serviceName + ".nix"));
-        config = addDefaultOptionValues res.options svc.config;
+        config = addDefaultOptionValues res.options
+          (if svc ? config then svc.config else svc);
         defaults = {
           extraConfig = "";
           extraModules = [];