Merge "Support for multi-flavor builds."
Xavier Ducrohet [Fri, 21 Sep 2012 16:42:29 +0000 (09:42 -0700)]

Trivial merge