Merge branch 'master' of git.evergreen-ils.org:Evergreen into SIP23738
authorMike Rylander <mrylander@gmail.com>
Thu, 26 May 2011 17:11:42 +0000 (13:11 -0400)
committerMike Rylander <mrylander@gmail.com>
Thu, 26 May 2011 17:11:42 +0000 (13:11 -0400)

Trivial merge