jsparre:
More info would be needed to provide you with an accurate reply.
But,
Refer to AWS D1.1:2002, 2.6.7. "...rivets and bolts used in bearing connections shall not be considered as sharing the load in combination with welds in a common faying surface..."
HSB's for slip-critical conections may be used to share stress with welds per the UBC/IBC and the Specification for Structural Joints Using ASTM A325/A490 Bolts.