Merge branch 'authority-control-sets' of git://git.evergreen-ils.org/evergreen/equino...
authorLebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Tue, 21 Jun 2011 18:23:56 +0000 (14:23 -0400)
committerLebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Tue, 21 Jun 2011 18:23:56 +0000 (14:23 -0400)

Trivial merge