merged from trunk

svn path=/branches/proto/v4/boost/progress.hpp; revision=47983
merged from trunk

svn path=/branches/proto/v4/boost/progress.hpp; revision=48781
merged from trunk

svn path=/branches/proto/v4/libs/timer/; revision=49607