Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
authorBill Erickson <berick@esilibrary.com>
Fri, 8 Jul 2011 14:00:23 +0000 (10:00 -0400)
committerBill Erickson <berick@esilibrary.com>
Fri, 8 Jul 2011 14:00:23 +0000 (10:00 -0400)

Trivial merge