For new installs, don't require phone by default.
Ensure PayPal Express does not send a discount line item if the discount is set to 0.00
Checkout Form Class Fix and Enhancement
Started using checkout form class functions in place of a couple of queries that were repeated in various places adounrd the code and noticed a couple of things.

* The data from the database that is stored in the class static can be retrieved with a parameter excluding heading fields but if a later call tries to retrive the values with heading fields the heading fields wouldn't get returned.  Changed the query to always retrieve the heading fields. Changed the retrival function to filter out heading fields if the caller asked for them to be filtered.

* Added a class function to return the count of fields

* Noticed that the version number was set to 3.9, since we are using the functions in 3.8.14 changed the version number in the header
Changed file back to upstream master to remove unneeded changes
The updates
quotes around a constant name were missing
Merge pull request #992 from JeffPyeBrook/missing-quotes-in-page-php

Quotes around a constant name were missing
Merge pull request #991 from JeffPyeBrook/cart-class-to-its-own-file

Cart Class File Cleanup and Function Deprecation
Changed version number to 3.8.10
Added public to constructor
Merge pull request #990 from JeffPyeBrook/checkout-form-test-fixes

Checkout Form Class Fix and Enhancement
Replace failed query with call to existing function
Merge pull request #1000 from JeffPyeBrook/remaining-quantity-query-error

Replace failed query with call to existing function
Colorbox CSS - Remove IE6 hack.

Remove support for IE6 transparency hack. We don't include the required images anyway (so wasn't working). Plus: http://www.ie6countdown.com/

Signed-off-by: Andrew <dent.ace@gmail.com>
Merge pull request #1013 from ace-dent/feature-css_tidy2

Colorbox CSS - Remove IE6 hack.
Revert "Colorbox CSS - Remove IE6 hack."

This reverts commit 270090af474fd734634b94a8bd4bc8e0ff9f008b.
First pass at extending capabilities in our importer.
Add product and product ID to wpsc_product_image filter.
Add product and product ID parameters to thumbnail filter as well.
Remove some debuggery and fix importer.  We now have a nicely extendable importer.  That's cool.
Merge remote-tracking branch 'upstream/master' into cart_class_cart_api_cleanup

Conflicts:
	wpsc-includes/cart.class.php