Merge branch 'master' of git+ssh://yeti.esilibrary.com/home/evergreen/evergreen-equin...
authorBill Erickson <berick@esilibrary.com>
Wed, 26 Jan 2011 20:15:14 +0000 (15:15 -0500)
committerBill Erickson <berick@esilibrary.com>
Wed, 26 Jan 2011 20:15:14 +0000 (15:15 -0500)

Trivial merge