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

Trivial merge