Merge branch 'master' of git.evergreen-ils.org:Evergreen into volume_copy_delete
authorBill Erickson <berick@esilibrary.com>
Mon, 20 Jun 2011 15:21:11 +0000 (11:21 -0400)
committerBill Erickson <berick@esilibrary.com>
Mon, 20 Jun 2011 15:21:11 +0000 (11:21 -0400)

Trivial merge