Merge branch 'template-toolkit-opac' of git+ssh://yeti.esilibrary.com/home/evergreen...
authorMike Rylander <mrylander@gmail.com>
Wed, 4 May 2011 15:54:01 +0000 (11:54 -0400)
committerMike Rylander <mrylander@gmail.com>
Wed, 4 May 2011 15:54:01 +0000 (11:54 -0400)

Trivial merge