Merging in version bump NO BUG
Bug 946719 - [xh, an] Add Xhosa and Aragonese locales to shipped-locales r=pike CLOSED TREE