Replace failed query with call to existing function
Merge branch 'remaining-quantity-query-error' into customer-meta-and-checkout

Conflicts:
	wpsc-includes/cart.class.php