Merge branch 'master' of git.evergreen-ils.org:Evergreen-DocBook
authorrsoulliere <robert.soulliere@mohawkcollege.ca>
Thu, 17 May 2012 13:26:28 +0000 (09:26 -0400)
committerrsoulliere <robert.soulliere@mohawkcollege.ca>
Thu, 17 May 2012 13:26:28 +0000 (09:26 -0400)

Trivial merge