Merge branch 'master' of git://git.evergreen-ils.org/Evergreen into lp-796795_serial_...
authorLebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Mon, 13 Jun 2011 21:29:59 +0000 (17:29 -0400)
committerLebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Mon, 13 Jun 2011 21:29:59 +0000 (17:29 -0400)

Trivial merge