Merge branch 'master' of github.com:rsoulliere/Evergreen-DocBook
authorRobert Soulliere <rsoulliere@libdog.mohawkcollege.ca>
Fri, 1 Oct 2010 19:56:14 +0000 (15:56 -0400)
committerRobert Soulliere <rsoulliere@libdog.mohawkcollege.ca>
Fri, 1 Oct 2010 19:56:14 +0000 (15:56 -0400)

Trivial merge