This commit was manufactured by cvs2svn to create branch 'conversion'.

svn path=/branches/conversion/boost/boost/timer.hpp; revision=7663
Removed old branches.

svn path=/branches/conversion/boost/boost/timer.hpp; revision=38550