Merge branch 'master' of git.evergreen-ils.org:Evergreen
authorJason Etheridge <jason@esilibrary.com>
Fri, 26 Aug 2011 20:03:15 +0000 (16:03 -0400)
committerJason Etheridge <jason@esilibrary.com>
Fri, 26 Aug 2011 20:03:15 +0000 (16:03 -0400)

Trivial merge