Merge branch 'master' of git.evergreen-ils.org:Evergreen
authorBill Erickson <berick@esilibrary.com>
Tue, 2 Aug 2011 15:31:24 +0000 (11:31 -0400)
committerBill Erickson <berick@esilibrary.com>
Tue, 2 Aug 2011 15:31:24 +0000 (11:31 -0400)

Trivial merge