Merge branch 'rel_2_0' of git.evergreen-ils.org:Evergreen into rel_2_0
authorJason Etheridge <jason@esilibrary.com>
Tue, 4 Oct 2011 18:33:20 +0000 (14:33 -0400)
committerJason Etheridge <jason@esilibrary.com>
Tue, 4 Oct 2011 18:33:20 +0000 (14:33 -0400)

Trivial merge