Conflicts:
	ec_store/ec_store.module

Conflicts:
	ec_cart/ec_cart.module

Fixes issue with incompatibility between adding items to the cart and processing items in the cart.

Conflicts:
	ec_cart/ec_cart.module

Conflicts:
	ec_product/ec_product.module

Conflicts:
	ec_checkout/ec_checkout.module
	ec_checkout/plugins/export_ui/ec_checkout_admin.inc

Conflicts:
	ec_product/ec_product.charge.inc

Conflicts:
	ec_checkout/ec_checkout.module

Conflicts:
	ec_customer/ec_customer.checkout.inc

Change the customer checkout so product attributes can determine if billing and shipping addresses are needed.

Stop the initialisation process for products doing a select for every product to get the type that we already have.

Conflicts:
	ec_checkout/ec_checkout.checkout.inc

Conflicts:
	ec_product/ec_product.checkout.inc

Conflicts:
	ec_cart/ec_cart.module

Conflicts:
	ec_store/ec_store.manage.inc
	ec_store/ec_store.module

This was having problems with the MySQL query cache.

Conflicts:
	ec_cart/ec_cart.module

Conflicts:
	ec_store/templates/theme.inc