Merge branch 'master' of github.com:rsoulliere/Evergreen-DocBook
authorSteve Sheppard <ssheps@gmail.com>
Mon, 3 Jan 2011 20:53:14 +0000 (15:53 -0500)
committerSteve Sheppard <ssheps@gmail.com>
Mon, 3 Jan 2011 20:53:14 +0000 (15:53 -0500)

Trivial merge