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

Trivial merge