Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
authorBill Erickson <berick@esilibrary.com>
Thu, 1 Sep 2011 20:48:28 +0000 (16:48 -0400)
committerBill Erickson <berick@esilibrary.com>
Thu, 1 Sep 2011 20:48:28 +0000 (16:48 -0400)

Trivial merge