fixing a bug with persistent cart - wasn't loading the cart unless the PERSISTENT_CART_MERGE option was true
fixing a bug with persistent cart - wasn't loading the cart unless the PERSISTENT_CART_MERGE option was true

twidi/satchmo,twidi/satchmo