Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
authorBill Erickson <berick@esilibrary.com>
Wed, 20 Jul 2011 18:19:41 +0000 (14:19 -0400)
committerBill Erickson <berick@esilibrary.com>
Wed, 20 Jul 2011 18:19:41 +0000 (14:19 -0400)

Trivial merge