Quickbook: Merge from trunk to quickbook-dev

svn path=/branches/quickbook-dev/boost/flyweight/; revision=75739