Merge branch 'master' of git.evergreen-ils.org:Evergreen into doc_consolidation_master
authorDan Scott <dan@coffeecode.net>
Wed, 23 May 2012 20:16:38 +0000 (16:16 -0400)
committerDan Scott <dan@coffeecode.net>
Wed, 23 May 2012 20:16:38 +0000 (16:16 -0400)

Trivial merge