Merge branch 'master' of github.com:rsoulliere/Evergreen-DocBook
authorrsoulliere <robert.soulliere@mohawkcollege.ca>
Sun, 6 Mar 2011 22:34:31 +0000 (17:34 -0500)
committerrsoulliere <robert.soulliere@mohawkcollege.ca>
Sun, 6 Mar 2011 22:34:31 +0000 (17:34 -0500)

Trivial merge