  <option value="MP">Northern Mariana Islands</option>
  <option value="OH">Ohio</option>
  <option value="OK">Oklahoma</option>
  <option value="OR">Oregon</option>
  <option value="PW">Palau</option>
  <option value="PA">Pennsylvania</option>
  <option value="PR">Puerto Rico</option>
  <option value="RI">Rhode Island</option>
  <option value="SC">South Carolina</option>
  <option value="SD">South Dakota</option>
 
</s> remove <option value="MH">Marshall Islands</option>
 </s> add  </s> remove     ('PW', 'Palau'),
 </s> add  </s> remove <option value="FM">Federated States of Micronesia</option>
 </s> add  </s> remove     ('MH', 'Marshall Islands'),
 </s> add  </s> remove     ('FM', 'Federated States of Micronesia'),
 </s> add 
  <option value="MP">Northern Mariana Islands</option>
  <option value="OH">Ohio</option>
  <option value="OK">Oklahoma</option>
  <option value="OR">Oregon</option>

  <option value="PA">Pennsylvania</option>
  <option value="PR">Puerto Rico</option>
  <option value="RI">Rhode Island</option>
  <option value="SC">South Carolina</option>
  <option value="SD">South Dakota</option>
keep keep keep keep replace keep keep keep keep keep
 Fixed #8425: removed the independant nations of Palau, Marshall Islands, and Micronesia from localflavor's list of US states.

...

Man, commit messages like that are incredibly fun to write.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8550 bcc190cf-cafb-0310-a4f2-bffc1f526a37 
tests/regressiontests/forms/localflavor/us.py