Merge "Don't use an empty main manifest when merging library manifests."
Xavier Ducrohet [Thu, 13 Sep 2012 02:16:19 +0000 (19:16 -0700)]

Trivial merge