If you replace the water pump, you definitly should replace the bypass hose which Greg described. It is not accessable with the water pump in place.
2004 C240 Wagon 203.261 Baby Benz
2008 ML320 CDI Highway Cruiser
2006 Toyota Prius, Saving the Planet @ 48 mpg
2000 F-150, Destroying the Planet @ 20 mpg
And remember folks, Only You Can Prevent Hilliary.