From e9f11e8efbb91f8acbea9f8c000eac971d61eae2 Mon Sep 17 00:00:00 2001
From: Beman Dawes <bdawes@acm.org>
Date: Thu, 26 Jun 2008 15:57:12 +0000
Subject: [PATCH] Merge changes from trunk root + boost/version.hpp

[SVN r46719]
---
 boost-build.jam | 17 +++++++++++------
 index.html      |  2 +-
 libs/config     |  2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/boost-build.jam b/boost-build.jam
index 33fcf8a3e9..1ba9dd2de3 100644
--- a/boost-build.jam
+++ b/boost-build.jam
@@ -1,10 +1,15 @@
-#~ Copyright (C) 2002-2003 David Abrahams.
-#~ Copyright (C) 2002-2003 Vladimir Prus.
-#~ Copyright (C) 2003,2007 Rene Rivera.
-#~ Use, modification and distribution are subject to the
-#~ Boost Software License, Version 1.0. (See accompanying file
-#~ LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+# Copyright (C) 2002-2003 David Abrahams.
+# Copyright (C) 2002-2003 Vladimir Prus.
+# Copyright (C) 2003,2007 Rene Rivera.
+# Use, modification and distribution are subject to the
+# Boost Software License, Version 1.0. (See accompanying file
+# LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#   This is the initial file loaded by Boost Jam when run from any Boost library
+# folder. It allows us to choose which Boost Build installation to use for
+# building Boost libraries. Unless explicitly selected using a command-line
+# option, the version included with the Boost library distribution is used (as
+# opposed to any other Boost Build version installed on the user's sytem).
 BOOST_ROOT = $(.boost-build-file:D) ;
 BOOST_BUILD = [ MATCH --boost-build=(.*) : $(ARGV) ] ;
 BOOST_BUILD ?= tools/build/v2 ;
diff --git a/index.html b/index.html
index e8b344d2eb..ce19891880 100644
--- a/index.html
+++ b/index.html
@@ -14,7 +14,7 @@
         <a href="index.html">
         <img src="boost.png" alt="boost.png (6897 bytes)" align="middle" width="277" height="86" border="0"></a></td>
       <td width="337" align="middle">
-      <h2 style="text-align: center">Release 1.35.0</h2>
+      <h2 style="text-align: center">Release 1.36.0</h2>
       </td>
     </tr>
   </table>
diff --git a/libs/config b/libs/config
index 365c54860b..7264ef8ac1 160000
--- a/libs/config
+++ b/libs/config
@@ -1 +1 @@
-Subproject commit 365c54860b521868ae7be0fdee95caf6a7ae8c95
+Subproject commit 7264ef8ac1bcb3f7e4eb56a3b4c65a2439a1d522