Merge config from Trunk - previous merge was incomplete.

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