Merge branch 'template-toolkit-opac' of git+ssh://yeti.esilibrary.com/home/evergreen...
authorMike Rylander <mrylander@gmail.com>
Mon, 16 May 2011 22:26:41 +0000 (18:26 -0400)
committerMike Rylander <mrylander@gmail.com>
Mon, 16 May 2011 22:26:41 +0000 (18:26 -0400)

Trivial merge