Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
authorJames Fournie <jfournie@sitka.bclibraries.ca>
Wed, 14 Sep 2011 17:32:50 +0000 (10:32 -0700)
committerJames Fournie <jfournie@sitka.bclibraries.ca>
Wed, 14 Sep 2011 17:32:50 +0000 (10:32 -0700)

Trivial merge