Merge branch 'kpac-scratch' of git.evergreen-ils.org:evergreen/equinox into kpac2 kpac2-orig
authorBill Erickson <berick@esilibrary.com>
Tue, 17 Apr 2012 14:40:55 +0000 (10:40 -0400)
committerBill Erickson <berick@esilibrary.com>
Tue, 17 Apr 2012 14:40:55 +0000 (10:40 -0400)

Trivial merge