Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
authorMichael Peters <mrpeters@library.in.gov>
Tue, 22 Jan 2013 15:15:07 +0000 (10:15 -0500)
committerMichael Peters <mrpeters@library.in.gov>
Tue, 22 Jan 2013 15:15:07 +0000 (10:15 -0500)

Trivial merge