Merge remote-tracking branch 'refs/remotes/willkg/plugins-infrastructure-rewrite'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Thu, 26 Jul 2012 15:46:52 +0000 (10:46 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Thu, 26 Jul 2012 15:46:52 +0000 (10:46 -0500)

Trivial merge