Addressfield: format US state as two letter abbreviation? Using Drupal 7 with Address Field module.  How do I get the US state (i.e., the administrative_area) to show as a standard two letter abbreviation rather than the full state name?

What shows now is:

123 Main St
Somewhere, Florida 12345


I want the node to show:

123 Main St
Somewhere, FL 12345


UPDATE

In address.inc in the addressfield module files, there is a function addressfield_format_address_generate which defines an '#options' array of all the different states (an associative array with 2-letter state abbreviations as the keys and state names as the values).

In addressfield.module, there is a function _addressfield_render_address which I believe checks if there is an '#options' defined and if so, tries to get the value for the given key.

So it would seem if I want to change this behavior I somehow need to override _addressfield_render_address
As part of this commit, U.S. states (and other countries' administrative areas) will now use their two letter abbreviations when rendered in address formats. Additionally, we now properly provide a comma between the city and state.

Additional code to get this format will no longer be required as of Address Field 7.x-1.0-beta4.