Merge branch 'master' of github.com:rsoulliere/Evergreen-DocBook
authorRobert Soulliere <rsoulliere@libdog.mohawkcollege.ca>
Mon, 26 Jul 2010 20:15:05 +0000 (16:15 -0400)
committerRobert Soulliere <rsoulliere@libdog.mohawkcollege.ca>
Mon, 26 Jul 2010 20:15:05 +0000 (16:15 -0400)

Trivial merge