Quickbook: Merge from trunk.

svn path=/branches/quickbook-dev/boost/context/; revision=77380