Merge branch 'master' of git+ssh://yeti.esilibrary.com/home/evergreen/evergreen-equin...
authorroot <root@squeeze-eeevil.lan.hq.esilibrary.com>
Thu, 12 May 2011 21:45:56 +0000 (17:45 -0400)
committerroot <root@squeeze-eeevil.lan.hq.esilibrary.com>
Thu, 12 May 2011 21:45:56 +0000 (17:45 -0400)

Trivial merge