Save state before 1.36 merges.

[SVN r47337]
Boost.Log merged to trunk.

[SVN r83860]