Merge branch 'master' of github.com:rsoulliere/Evergreen-DocBook
authorRobert Soulliere <rsoulliere@libdog.mohawkcollege.ca>
Tue, 16 Nov 2010 18:21:51 +0000 (13:21 -0500)
committerRobert Soulliere <rsoulliere@libdog.mohawkcollege.ca>
Tue, 16 Nov 2010 18:21:51 +0000 (13:21 -0500)

Trivial merge