Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
authorMike Rylander <mrylander@gmail.com>
Thu, 9 Jun 2011 18:07:11 +0000 (14:07 -0400)
committerMike Rylander <mrylander@gmail.com>
Thu, 9 Jun 2011 18:07:11 +0000 (14:07 -0400)

Trivial merge