Merge branch 'master' of github.com:rsoulliere/Evergreen-DocBook
authorSteve Sheppard <ssheps@gmail.com>
Sun, 19 Sep 2010 23:24:54 +0000 (19:24 -0400)
committerSteve Sheppard <ssheps@gmail.com>
Sun, 19 Sep 2010 23:24:54 +0000 (19:24 -0400)

Trivial merge