Index: django/contrib/localflavor/us/us_states.py
===================================================================
--- django/contrib/localflavor/us/us_states.py	(revision 9791)
+++ django/contrib/localflavor/us/us_states.py	(working copy)
@@ -12,6 +12,9 @@
     ('AS', 'American Samoa'),
     ('AZ', 'Arizona'),
     ('AR', 'Arkansas'),
+    ('AA', 'Armed Forces Americas'),
+    ('AE', 'Armed Forces Europe'),
+    ('AP', 'Armed Forces Pacific'),
     ('CA', 'California'),
     ('CO', 'Colorado'),
     ('CT', 'Connecticut'),
@@ -66,6 +69,8 @@
 )
 
 STATES_NORMALIZED = {
+    'aa': 'AA',
+    'ae': 'AE',
     'ak': 'AK',
     'al': 'AL',
     'ala': 'AL',
@@ -73,11 +78,18 @@
     'alaska': 'AK',
     'american samao': 'AS',
     'american samoa': 'AS',
+    'ap': 'AP',
     'ar': 'AR',
     'ariz': 'AZ',
     'arizona': 'AZ',
     'ark': 'AR',
     'arkansas': 'AR',
+    'armed forces africa': 'AE',
+    'armed forces americas': 'AA',
+    'armed forces europe': 'AE',
+    'armed forces pacific': 'AP',
+    'armed forces canada': 'AE',
+    'armed forces middle east': 'AE',
     'as': 'AS',
     'az': 'AZ',
     'ca': 'CA',
Index: tests/regressiontests/forms/localflavor/us.py
===================================================================
--- tests/regressiontests/forms/localflavor/us.py	(revision 9791)
+++ tests/regressiontests/forms/localflavor/us.py	(working copy)
@@ -190,6 +190,9 @@
 <option value="AS">American Samoa</option>
 <option value="AZ">Arizona</option>
 <option value="AR">Arkansas</option>
+<option value="AA">Armed Forces Americas</option>
+<option value="AE">Armed Forces Europe</option>
+<option value="AP">Armed Forces Pacific</option>
 <option value="CA">California</option>
 <option value="CO">Colorado</option>
 <option value="CT">Connecticut</option>