really screwy merge trancking behavior, starting over
Boost.Log merged to trunk.