Redo py3k branching from trunk again

svn path=/sandbox-branches/bhy/py3k/boost/functional/factory.hpp; revision=52115