Merge branch 'rel_2_2' of git.evergreen-ils.org:Evergreen into kcls-test/rel_2_2...
authorBill Erickson <berick@esilibrary.com>
Tue, 5 Jun 2012 21:04:20 +0000 (17:04 -0400)
committerBill Erickson <berick@esilibrary.com>
Tue, 5 Jun 2012 21:04:20 +0000 (17:04 -0400)

Trivial merge