Merge branch 'authority-control-sets' of git+ssh://yeti.esilibrary.com/home/evergreen...
authorroot <root@squeeze-eeevil.lan.hq.esilibrary.com>
Mon, 16 May 2011 14:49:47 +0000 (10:49 -0400)
committerroot <root@squeeze-eeevil.lan.hq.esilibrary.com>
Mon, 16 May 2011 14:49:47 +0000 (10:49 -0400)

Trivial merge