Merge branch 'kpac' of git.evergreen-ils.org:evergreen/equinox into kpac2
authorBill Erickson <berick@esilibrary.com>
Mon, 23 Apr 2012 19:44:46 +0000 (15:44 -0400)
committerBill Erickson <berick@esilibrary.com>
Mon, 23 Apr 2012 19:44:46 +0000 (15:44 -0400)

Trivial merge