Bootstrapped on x86_64-pc-linux-gnu with no regressions.  Pushed.

Andrew