Max Gilead - 2006-02-01

Proper, self-conained patch