Merge branch 'master' into kcls-opac-black-death
authorBill Erickson <erickson@esilibrary.com>
Wed, 15 Dec 2010 19:40:31 +0000 (14:40 -0500)
committerBill Erickson <erickson@esilibrary.com>
Wed, 15 Dec 2010 19:40:31 +0000 (14:40 -0500)

Trivial merge