Merge branch 'master' of github.com:rsoulliere/Evergreen-DocBook
authorSteve Sheppard <ssheps@gmail.com>
Thu, 30 Sep 2010 19:02:20 +0000 (15:02 -0400)
committerSteve Sheppard <ssheps@gmail.com>
Thu, 30 Sep 2010 19:02:20 +0000 (15:02 -0400)

Trivial merge