copy from upstream master
Merge branch 'master' of github.com:JeffSparkleGear/WP-e-Commerce

Conflicts:
	wpsc-includes/cart.class.php