Merge branch 'master' of github.com:rsoulliere/Evergreen-DocBook
authorRobert Soulliere <rsoulliere@libdog.mohawkcollege.ca>
Tue, 7 Sep 2010 16:30:20 +0000 (12:30 -0400)
committerRobert Soulliere <rsoulliere@libdog.mohawkcollege.ca>
Tue, 7 Sep 2010 16:30:20 +0000 (12:30 -0400)

Trivial merge