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

Trivial merge