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

Trivial merge