Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
authorMike Rylander <mrylander@gmail.com>
Fri, 24 Jun 2011 16:24:38 +0000 (12:24 -0400)
committerMike Rylander <mrylander@gmail.com>
Fri, 24 Jun 2011 16:24:38 +0000 (12:24 -0400)

Trivial merge