Merge "Restructured the 'multiproject' test project."
Xavier Ducrohet [Thu, 20 Sep 2012 19:32:35 +0000 (12:32 -0700)]

Trivial merge