Merge branch 'master' of git://git.evergreen-ils.org/Evergreen into authority-control...
authorLebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Fri, 17 Jun 2011 16:06:49 +0000 (12:06 -0400)
committerLebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Fri, 17 Jun 2011 16:06:49 +0000 (12:06 -0400)

Trivial merge