Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
authorMichael Peters <mrpeters@library.in.gov>
Wed, 15 Aug 2012 18:32:51 +0000 (14:32 -0400)
committerMichael Peters <mrpeters@library.in.gov>
Wed, 15 Aug 2012 18:32:51 +0000 (14:32 -0400)

Trivial merge