Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
authorMike Rylander <mrylander@gmail.com>
Tue, 21 Jun 2011 17:25:25 +0000 (13:25 -0400)
committerMike Rylander <mrylander@gmail.com>
Tue, 21 Jun 2011 17:25:25 +0000 (13:25 -0400)

Trivial merge