Merge branch 'kpac' into kpac2 kpac2
authorBill Erickson <berick@esilibrary.com>
Fri, 25 May 2012 13:47:59 +0000 (09:47 -0400)
committerBill Erickson <berick@esilibrary.com>
Fri, 25 May 2012 13:47:59 +0000 (09:47 -0400)

Trivial merge