Merge branch 'rel_2_0' of git.evergreen-ils.org:Evergreen into dbs/openlibrary-read
authorDan Scott <dan@coffeecode.net>
Thu, 2 Jun 2011 01:43:40 +0000 (21:43 -0400)
committerDan Scott <dan@coffeecode.net>
Thu, 2 Jun 2011 01:43:40 +0000 (21:43 -0400)

Trivial merge