Merge "Changed plugin group and package names."
Xavier Ducrohet [Tue, 21 Aug 2012 18:49:22 +0000 (11:49 -0700)]

Trivial merge