Merge branch 'master' of git.evergreen-ils.org:Evergreen-DocBook
authorrsoulliere <robert.soulliere@mohawkcollege.ca>
Tue, 24 May 2011 14:19:15 +0000 (10:19 -0400)
committerrsoulliere <robert.soulliere@mohawkcollege.ca>
Tue, 24 May 2011 14:19:15 +0000 (10:19 -0400)

Trivial merge