Merge branch 'master' of github.com:chriskohlhoff/asio

asio/release.pl

diff --git a/asio/release.pl b/asio/release.pl
index a4f469a..a27ae12 100755
--- a/asio/release.pl
+++ b/asio/release.pl
@@ -168,7 +168,7 @@
 {
   $ENV{BOOST_ROOT} = abs_path("../boost");
   system("rm -rf doc");
-  my $bjam = abs_path(glob("../boost/tools/jam/src/bin.*/bjam"));
+  my $bjam = abs_path(glob("../boost/bjam"));
   chdir("src/doc");
   system("$bjam clean");
   system("rm -rf html");
@@ -188,7 +188,7 @@
 sub build_boost_asio_doc
 {
   my $cwd = getcwd();
-  my $bjam = abs_path(glob("../boost/tools/jam/src/bin.*/bjam"));
+  my $bjam = abs_path(glob("../boost/bjam"));
   chdir("../boost/doc");
   system("$bjam clean");
   system("rm -rf html/boost_asio");