Merge branch 'authority-control-sets' of git.evergreen-ils.org:evergreen/equinox...
authorMike Rylander <mrylander@gmail.com>
Fri, 24 Jun 2011 15:56:59 +0000 (11:56 -0400)
committerMike Rylander <mrylander@gmail.com>
Fri, 24 Jun 2011 15:56:59 +0000 (11:56 -0400)

Trivial merge