1 2 0 M ay 2 00 4 The GRB / XRF-SN Association