Merge branch 'master' of github.com:rsoulliere/Evergreen-DocBook
authorRobert Soulliere <rsoulliere@libdog.mohawkcollege.ca>
Fri, 6 Aug 2010 01:23:30 +0000 (21:23 -0400)
committerRobert Soulliere <rsoulliere@libdog.mohawkcollege.ca>
Fri, 6 Aug 2010 01:23:30 +0000 (21:23 -0400)

Trivial merge