Merge branch 'HEAD' of git@github.com:rsoulliere/Evergreen-DocBook.git
authorHilary Caws-Elwitt <hce@epix.net>
Mon, 9 May 2011 14:36:40 +0000 (10:36 -0400)
committerHilary Caws-Elwitt <hce@epix.net>
Mon, 9 May 2011 14:36:40 +0000 (10:36 -0400)

Trivial merge