Merge branch 'master' of EvergreenGitServer:evergreen/joelewis into circ_config_policy circ_config_policy
authorJoseph Lewis <joehms22@gmail.com>
Thu, 23 Jun 2011 18:48:36 +0000 (12:48 -0600)
committerJoseph Lewis <joehms22@gmail.com>
Thu, 23 Jun 2011 18:48:36 +0000 (12:48 -0600)

Trivial merge