Default country setting ignored in address forms

The store module ignores the address.modules default country setting when disaplaying a shipping and/or billing form.
This can easily be rectified with a quick change to lines 209 and 219 of store.inc

  $fields .= form_select(t('Country'), "billing_country", isset($edit['billing_country']) ? $edit['billing_country'] : variable_get('ec_country', '') , address_build_countries(), '');