Merge branch 'kpac' into kpac-ac
authorBill Erickson <berick@esilibrary.com>
Tue, 22 May 2012 13:44:09 +0000 (09:44 -0400)
committerBill Erickson <berick@esilibrary.com>
Tue, 22 May 2012 13:44:09 +0000 (09:44 -0400)

Trivial merge