Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
authorMichael Peters <mrpeters@library.in.gov>
Mon, 11 Jun 2012 17:15:05 +0000 (13:15 -0400)
committerMichael Peters <mrpeters@library.in.gov>
Mon, 11 Jun 2012 17:15:05 +0000 (13:15 -0400)

Trivial merge