Merge branch 'master' of git.evergreen-ils.org:Evergreen into kids-opac
authorBill Erickson <berick@esilibrary.com>
Tue, 26 Jun 2012 19:09:23 +0000 (15:09 -0400)
committerBill Erickson <berick@esilibrary.com>
Tue, 26 Jun 2012 19:09:23 +0000 (15:09 -0400)

Trivial merge