Merged revisions 52836 via svnmerge from https://svn.boost.org/svn/boost/trunk
........
r52836 | eric_niebler | 2009-05-07 10:16:46 -0700 (Thu, 07 May 2009) | 1 line
work around conflict with python headers