Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
authorBill Erickson <berick@esilibrary.com>
Fri, 10 Jun 2011 16:51:17 +0000 (12:51 -0400)
committerBill Erickson <berick@esilibrary.com>
Fri, 10 Jun 2011 16:51:17 +0000 (12:51 -0400)

Trivial merge