Merge branch 'master' of git://git.evergreen-ils.org/Evergreen into ttopac
authorevergreen <evergreen@squeeze.debian>
Thu, 16 Jun 2011 18:07:17 +0000 (14:07 -0400)
committerevergreen <evergreen@squeeze.debian>
Thu, 16 Jun 2011 18:07:17 +0000 (14:07 -0400)

Trivial merge