Merge branch 'rel_2_0' of git.evergreen-ils.org:Evergreen into dbs/openlibrary-read
authorDan Scott <dan@coffeecode.net>
Wed, 1 Jun 2011 02:22:32 +0000 (22:22 -0400)
committerDan Scott <dan@coffeecode.net>
Wed, 1 Jun 2011 02:22:32 +0000 (22:22 -0400)

Trivial merge