Merge "Fix tests for the flavors project."
Xavier Ducrohet [Fri, 21 Sep 2012 21:25:01 +0000 (14:25 -0700)]

Trivial merge