Merge pressflow6 6.33 update

I haven't tested this yet; Judging from the number of commits here it looks to me like it's possible the previous merge wasn't done against the upstream?