Merge branch 'master' of git.evergreen-ils.org:Evergreen into kcls-opac-skin
authorBill Erickson <berick@esilibrary.com>
Thu, 16 Jun 2011 15:25:46 +0000 (11:25 -0400)
committerBill Erickson <berick@esilibrary.com>
Thu, 16 Jun 2011 15:25:46 +0000 (11:25 -0400)

Trivial merge