Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
authorBill Erickson <berick@esilibrary.com>
Wed, 29 Jun 2011 17:37:42 +0000 (13:37 -0400)
committerBill Erickson <berick@esilibrary.com>
Wed, 29 Jun 2011 17:37:42 +0000 (13:37 -0400)

Trivial merge