Merge config changes from Trunk.

svn path=/branches/release/boost/current_function.hpp; revision=83497