Merge mainline to 2.5.4 final.  This is very
possibly the last vger CVS merge I'll be doing
as Linus moves over to Bitkeeper which I am already
using to push 2.5.x changes to him.
The 2.4.x CVS will remain active assuming Marcelo decides
to not use BK for his work.