Merge branch 'master' of github.com:rsoulliere/Evergreen-DocBook
authorSteve Sheppard <ssheps@gmail.com>
Thu, 16 Sep 2010 14:03:17 +0000 (10:03 -0400)
committerSteve Sheppard <ssheps@gmail.com>
Thu, 16 Sep 2010 14:03:17 +0000 (10:03 -0400)

Trivial merge