Merge "Fix package renaming."
Xavier Ducrohet [Thu, 21 Mar 2013 00:25:48 +0000 (00:25 +0000)]

Trivial merge