Subscription manager incorrectly showing 'None' under trial

If trial is set to 2 weeks and regular billing period is 4 weeks, Subscription Manager will incorrectly show trial as none, due to bad logic in uc_recurring_subscription.admin.inc:

      if (feature->regular_interval_value != $feature->initial_charge_value &&
               $feature->regular_interval_unit != $feature->initial_charge_unit) {
                   $trial = uc_price($product->sell_price, array()) .' - '. $feature->initial_charge_value .' '. $feature->initial_charge_unit;

should be changed to

if (!($feature->regular_interval_value == $feature->initial_charge_value &&
           $feature->regular_interval_unit == $feature->initial_charge_unit)) {
                   $trial = uc_price($product->sell_price, array()) .' - '. $feature->initial_charge_value .' '. $feature->initial_charge_unit;

Otherwise, Subscription Manager will show trial as none if either the interval unit OR the interval value match the regular charge interval unit / value. Should only be marked none if BOTH interval unit AND interval value match.