Merge branch 'master' of git.evergreen-ils.org:Evergreen into user/dbs/lp-787150-ws
authorDan Scott <dan@coffeecode.net>
Wed, 25 May 2011 02:33:44 +0000 (22:33 -0400)
committerDan Scott <dan@coffeecode.net>
Wed, 25 May 2011 02:33:44 +0000 (22:33 -0400)

Trivial merge