So this is incredibly confusing to me, but git is supposedly doing something clever that allows these patches to apply in my repo but not in a clean one.
In any event, I'm resending the patches after being applied to my master, which should resolve any conflict and allow them to apply. jamie.
