Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
authorJames Fournie <jfournie@sitka.bclibraries.ca>
Mon, 19 Sep 2011 22:46:33 +0000 (15:46 -0700)
committerJames Fournie <jfournie@sitka.bclibraries.ca>
Mon, 19 Sep 2011 22:46:33 +0000 (15:46 -0700)

Trivial merge