There were some conflicts applying the previous patchkit to the latest mainline tree; only difference is that I resolved them. -Andi --