Merge branch 'master' of github.com:rsoulliere/Evergreen-DocBook
authorRobert Soulliere <rsoulliere@libdog.mohawkcollege.ca>
Fri, 13 Aug 2010 20:50:55 +0000 (16:50 -0400)
committerRobert Soulliere <rsoulliere@libdog.mohawkcollege.ca>
Fri, 13 Aug 2010 20:50:55 +0000 (16:50 -0400)

Trivial merge