Sync my repo with the mozilla repo #7

Merged
merged 12 commits into from May 30, 2012