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

Trivial merge