Merge branch 'master' of git.evergreen-ils.org:Evergreen into build_version
authorMike Rylander <mrylander@gmail.com>
Fri, 3 Jun 2011 13:54:35 +0000 (09:54 -0400)
committerMike Rylander <mrylander@gmail.com>
Fri, 3 Jun 2011 13:54:35 +0000 (09:54 -0400)

Trivial merge