i've already said this in a couple of other threads but i swear by omega-3 fatty acids. I first found out about it in an article in Muscle & Fitness:
"Probably the top dietary supplement for joints is fish oil, due to the richness in omega-3 fatty acids. By dampening inflammation, fish oil helps injuries heal faster and reduces pain... Most forms now sold are about 30% omega-3 fatty acids, which inclide EPA (eicosapentaenoic acid)... Along with protecting against heart strokes, EPA's anti-inflammatory effects appear to reduce muscle loss in farm animals, so it may be a double-duty bodybuilding and preventitive medicine supplement"