Merge branch 'master' of github.com:rsoulliere/Evergreen-DocBook
authorRobert Soulliere <rsoulliere@libdog.mohawkcollege.ca>
Sat, 18 Sep 2010 17:42:05 +0000 (13:42 -0400)
committerRobert Soulliere <rsoulliere@libdog.mohawkcollege.ca>
Sat, 18 Sep 2010 17:42:05 +0000 (13:42 -0400)

Trivial merge