Merge branch 'master' of https://github.com/oreillymedia/HTMLBook

Conflicts:
	htmlbook-xsl/common.xsl
	htmlbook-xsl/xspec/common.xspec