Merge branch 'master' of git.evergreen-ils.org:Evergreen
authorJason Etheridge <jason@esilibrary.com>
Mon, 13 Jun 2011 14:35:41 +0000 (10:35 -0400)
committerJason Etheridge <jason@esilibrary.com>
Mon, 13 Jun 2011 14:35:41 +0000 (10:35 -0400)

Trivial merge