Merge branch 'collab/berick/template-toolkit-opac-master-merge' of git.evergreen...
authorBill Erickson <berick@esilibrary.com>
Tue, 16 Aug 2011 19:33:03 +0000 (15:33 -0400)
committerBill Erickson <berick@esilibrary.com>
Tue, 16 Aug 2011 19:33:03 +0000 (15:33 -0400)

Trivial merge