Merge github.com:rsoulliere/Evergreen-DocBook
authorSteve Sheppard <sheppards.email@gmail.com>
Fri, 27 Aug 2010 21:39:51 +0000 (17:39 -0400)
committerSteve Sheppard <sheppards.email@gmail.com>
Fri, 27 Aug 2010 21:39:51 +0000 (17:39 -0400)

Trivial merge