Michael> Looks fine except that it includes two of my patches
Michael> which you said you have applied.
Sorry, I wrote the patch before I committed those patches, and then
realized I needed to apply them when I generated that diff. But I
forgot to update the diff.
Anyway, the situation is under control ;)
- R.