My apologies -- I appear to have sent the patches out in reverse order.
Please apply patch 3 before the other two.
This is the first time I've used our automated tools to make small patches
out of big ones, but I think I have it figured out now.
Thanks for your patience.
-Mitch Williams