Merge branch 'collab/berick/template-toolkit-opac-master-merge' of git.evergreen...
authorDan Scott <dan@coffeecode.net>
Tue, 16 Aug 2011 19:11:49 +0000 (15:11 -0400)
committerDan Scott <dan@coffeecode.net>
Tue, 16 Aug 2011 19:11:49 +0000 (15:11 -0400)

Trivial merge