Merge branch 'rel_2_0' of git.evergreen-ils.org:Evergreen into collab/gmcharlt/rel_2_...
authorMike Rylander <mrylander@gmail.com>
Mon, 20 Jun 2011 14:24:33 +0000 (10:24 -0400)
committerMike Rylander <mrylander@gmail.com>
Mon, 20 Jun 2011 14:24:33 +0000 (10:24 -0400)

Trivial merge