Bug 967296 - Remove diagnostic code added in bug 946929.  r=tn
Bug 990655 - Don't apply 'text-overflow' to nsComboboxControlFrame, its anon block deals with it.  r=roc