Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
authorMike Rylander <mrylander@gmail.com>
Mon, 20 Jun 2011 15:52:10 +0000 (11:52 -0400)
committerMike Rylander <mrylander@gmail.com>
Mon, 20 Jun 2011 15:52:10 +0000 (11:52 -0400)

Trivial merge