Merge branch 'master' into kcls-opac-black-death
authorBill Erickson <erickson@esilibrary.com>
Thu, 16 Dec 2010 20:40:25 +0000 (15:40 -0500)
committerBill Erickson <erickson@esilibrary.com>
Thu, 16 Dec 2010 20:40:25 +0000 (15:40 -0500)

Trivial merge