Merged fixes from bleeding-edge.

git-svn-id: https://boost-log.svn.sourceforge.net/svnroot/boost-log/trunk/boost-log@850 ab6a8de6-4e00-4c3d-a860-8899c17d353f