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

Trivial merge