really screwy merge trancking behavior, starting over

[SVN r44394]
Boost.Log merged to trunk.

[SVN r83860]