Merging from trunk

svn path=/branches/release/libs/asio/; revision=84745