Merge "Refactor VariantConfig to contain the tested config."
Xavier Ducrohet [Wed, 29 Aug 2012 23:41:39 +0000 (16:41 -0700)]

Trivial merge