(merge from head)

Fix...
  tools/jam/index.html:
    *A* broken link: ../../doc/html/jam.html


[SVN r34678]

tools/build

@@ -1 +1 @@
-Subproject commit f03a08c9b0dc74610884b169fb72054aefa1cea0
+Subproject commit 690c509accc2bb32cd19db7ad0a153c2729ead59