Merge commit 'origin/master' into opac-refactor
authorBill Erickson <erickson@esilibrary.com>
Tue, 14 Dec 2010 20:44:01 +0000 (15:44 -0500)
committerBill Erickson <erickson@esilibrary.com>
Tue, 14 Dec 2010 20:44:01 +0000 (15:44 -0500)

Trivial merge