Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
authorMike Rylander <mrylander@gmail.com>
Sun, 19 Jun 2011 01:39:15 +0000 (21:39 -0400)
committerMike Rylander <mrylander@gmail.com>
Sun, 19 Jun 2011 01:39:15 +0000 (21:39 -0400)

Trivial merge