Merge branch 'master' of git.evergreen-ils.org:Evergreen
authorBill Erickson <berick@esilibrary.com>
Fri, 10 Jun 2011 15:48:53 +0000 (11:48 -0400)
committerBill Erickson <berick@esilibrary.com>
Fri, 10 Jun 2011 15:48:53 +0000 (11:48 -0400)

Trivial merge