Merge branch 'master' of github.com:rsoulliere/Evergreen-DocBook
authorRobert Soulliere <rsoulliere@libdog.mohawkcollege.ca>
Mon, 4 Oct 2010 16:41:11 +0000 (12:41 -0400)
committerRobert Soulliere <rsoulliere@libdog.mohawkcollege.ca>
Mon, 4 Oct 2010 16:41:11 +0000 (12:41 -0400)

Trivial merge