Merge branch 'rel_2_0' of git.evergreen-ils.org:Evergreen into rel_2_0
authorMike Rylander <mrylander@gmail.com>
Tue, 28 Jun 2011 18:07:17 +0000 (14:07 -0400)
committerMike Rylander <mrylander@gmail.com>
Tue, 28 Jun 2011 18:07:17 +0000 (14:07 -0400)

Trivial merge