Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
authorLebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Tue, 19 Jul 2011 21:04:38 +0000 (17:04 -0400)
committerLebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Tue, 19 Jul 2011 21:04:38 +0000 (17:04 -0400)

Trivial merge