Merge branch 'master' of git+ssh://yeti.esilibrary.com/home/evergreen/evergreen-equin...
authorBill Erickson <berick@esilibrary.com>
Mon, 24 Jan 2011 14:42:08 +0000 (09:42 -0500)
committerBill Erickson <berick@esilibrary.com>
Mon, 24 Jan 2011 14:42:08 +0000 (09:42 -0500)

Trivial merge