Merge branch 'master' of git.evergreen-ils.org:Evergreen into build_version
authorMike Rylander <mrylander@gmail.com>
Mon, 13 Jun 2011 14:16:48 +0000 (10:16 -0400)
committerMike Rylander <mrylander@gmail.com>
Mon, 13 Jun 2011 14:16:48 +0000 (10:16 -0400)

Trivial merge