Quick merge status updates.

I'm planning to do 1.4.1 soonish from what's currently in "next" (fixes already in "master" plus format-patch updates and some more tests). I am waiting for a confirmation that Johannes's cvsimport fix posted earlier on the list does work, or maybe Martin would come up with an alternative. I think then we are good for a release.

Immediately after 1.4.1 happens, I would like to pull in "Git.xs/Git.pm" series by Pasky into "next". After that settles I'd pull in the diff options rewrite by Timo.

For some time, "pu" was left in the state that does not to pass the testsuite, but I've fixed what's minimally needed (the breakage was mostly from the diff options rewrite). People who regularly follow "next" on platforms other than i386 or x86-64 Linux might want to try out tonight's "pu" to make sure "Git.xs/Git.pm" series works on their box before it hits "next". Breakage there would stop your "git pull" working, so this is somewhat important.

Thanks.