Merge branch 'master' of git+ssh://yeti.esilibrary.com/home/evergreen/evergreen-equin...
authorBill Erickson <berick@esilibrary.com>
Tue, 18 Jan 2011 19:39:36 +0000 (14:39 -0500)
committerBill Erickson <berick@esilibrary.com>
Tue, 18 Jan 2011 19:39:36 +0000 (14:39 -0500)

Trivial merge