Merge branch 'template-toolkit-opac' of git://git.evergreen-ils.org/evergreen/equinox...
authorevergreen <evergreen@squeeze.debian>
Mon, 27 Jun 2011 19:56:22 +0000 (15:56 -0400)
committerevergreen <evergreen@squeeze.debian>
Mon, 27 Jun 2011 19:56:22 +0000 (15:56 -0400)

Trivial merge