Merge from trunk.

svn path=/branches/quickbook-1.5-spirit2/; revision=59528
Include replaceable change from merge.

svn path=/branches/quickbook-1.5-spirit2/; revision=59529
Merge from trunk.

svn path=/branches/quickbook-1.5-spirit2/; revision=59533
Merge from trunk.

svn path=/branches/quickbook-1.5-spirit2/; revision=59545
Properly merge callout fix.

svn path=/branches/quickbook-1.5-spirit2/; revision=59546
Fix ids in included files.

svn path=/branches/quickbook-1.5-spirit2/; revision=59547
Change header, as support_attributes.hpp doesn't seem to work on its
own.

svn path=/branches/quickbook-1.5-spirit2/; revision=59548
Bump the version number.

svn path=/branches/quickbook-1.5-spirit2/; revision=59549
Reorder the rules within the block and phrase grammars.

I think this order makes sense, I'm not sure if anyone else would agree.

svn path=/branches/quickbook-1.5-spirit2/; revision=59550
Better handling of single member structs.

svn path=/branches/quickbook-1.5-spirit2/; revision=59551
Inline some unnecessary rules.

svn path=/branches/quickbook-1.5-spirit2/; revision=59552
Explicitly instantiate process separately from the grammars and
introduce a hook for generating the output separately.

svn path=/branches/quickbook-1.5-spirit2/; revision=59553
Starting to separate out boostbook encoding.

svn path=/branches/quickbook-1.5-spirit2/; revision=59554
Don't include markup in the grammars, instead use a string to indicate
what type of markup is expected.

svn path=/branches/quickbook-1.5-spirit2/; revision=59555
The rest of the phrase actions.

svn path=/branches/quickbook-1.5-spirit2/; revision=59556
Separate out block output.

svn path=/branches/quickbook-1.5-spirit2/; revision=59558
Remove some of the stuff in utils.?pp

svn path=/branches/quickbook-1.5-spirit2/; revision=59559
Partially translate doc_info handling to new style.

svn path=/branches/quickbook-1.5-spirit2/; revision=59560
Remove plain_char declaration.

svn path=/branches/quickbook-1.5-spirit2/; revision=59561
Make the quickbook.hpp and actions.hpp match their respective cpp files.

svn path=/branches/quickbook-1.5-spirit2/; revision=59562