merged from trunk

svn path=/branches/proto/v4/boost/asio/; revision=49607