really screwy merge trancking behavior, starting over

svn path=/branches/proto/v4.bak/boost/functional.hpp; revision=44394
dead branch

svn path=/branches/proto/v4.bak/libs/functional/function_test.cpp; revision=44405