Merge remote branch 'working/collab/berick/tpac-misc-cleanup' into template-toolkit...
authorBill Erickson <berick@esilibrary.com>
Mon, 12 Sep 2011 16:15:34 +0000 (12:15 -0400)
committerBill Erickson <berick@esilibrary.com>
Mon, 12 Sep 2011 16:15:34 +0000 (12:15 -0400)

Trivial merge