Merge branch 'master' of github.com:rsoulliere/Evergreen-DocBook
authorSteve Sheppard <ssheps@gmail.com>
Wed, 15 Sep 2010 15:49:43 +0000 (11:49 -0400)
committerSteve Sheppard <ssheps@gmail.com>
Wed, 15 Sep 2010 15:49:43 +0000 (11:49 -0400)

Trivial merge