merge latest main trunk fixes

svn path=/branches/mpl_v2_2/boost/boost/python.hpp; revision=18769