Merge branch 'authority-control-sets-squashed_for_master'
authorLebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Mon, 11 Jul 2011 18:26:16 +0000 (14:26 -0400)
committerLebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Mon, 11 Jul 2011 18:26:16 +0000 (14:26 -0400)
Authority control sets! Largely by Mike Rylander, somewhat by me and
others.

This is the merge commit.  See individual commit messages for more
detail.

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>

Trivial merge