Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
authorMichael Peters <mrpeters@library.in.gov>
Fri, 11 Jan 2013 19:15:08 +0000 (14:15 -0500)
committerMichael Peters <mrpeters@library.in.gov>
Fri, 11 Jan 2013 19:15:08 +0000 (14:15 -0500)

Trivial merge